diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 142dc0251d066dc33c32489562dbfc9d4da6d35d..8bde8ee8bfc0d220c9d42bafd051bdc28c438385 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -510,7 +510,7 @@ def TestClusterBurnin():
   master = qa_config.GetMasterNode()
 
   options = qa_config.get("options", {})
-  disk_template = options.get("burnin-disk-template", "drbd")
+  disk_template = options.get("burnin-disk-template", constants.DT_DRBD8)
   parallel = options.get("burnin-in-parallel", False)
   check_inst = options.get("burnin-check-instances", False)
   do_rename = options.get("burnin-rename", "")
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 5a07433800df343e7679813e49b7a2b9331c0b61..bf6b325dbb9d50f54bcb469e1fc9262666eb06bf 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -194,7 +194,7 @@ def IsDiskReplacingSupported(instance):
 def TestInstanceAddWithPlainDisk(nodes):
   """gnt-instance add -t plain"""
   assert len(nodes) == 1
-  return _DiskTest(nodes[0].primary, "plain")
+  return _DiskTest(nodes[0].primary, constants.DT_PLAIN)
 
 
 @InstanceCheck(None, INST_UP, RETURN_VALUE)
@@ -202,7 +202,7 @@ def TestInstanceAddWithDrbdDisk(nodes):
   """gnt-instance add -t drbd"""
   assert len(nodes) == 2
   return _DiskTest(":".join(map(operator.attrgetter("primary"), nodes)),
-                   "drbd")
+                   constants.DT_DRBD8)
 
 
 @InstanceCheck(None, INST_DOWN, FIRST_ARG)
@@ -498,14 +498,16 @@ def TestInstanceStoppedModify(instance):
 def TestInstanceConvertDiskToPlain(instance, inodes):
   """gnt-instance modify -t"""
   name = instance.name
+
   template = qa_config.GetInstanceTemplate(instance)
-  if template != "drbd":
+  if template != constants.DT_DRBD8:
     print qa_utils.FormatInfo("Unsupported template %s, skipping conversion"
                               " test" % template)
     return
+
   assert len(inodes) == 2
-  AssertCommand(["gnt-instance", "modify", "-t", "plain", name])
-  AssertCommand(["gnt-instance", "modify", "-t", "drbd",
+  AssertCommand(["gnt-instance", "modify", "-t", constants.DT_PLAIN, name])
+  AssertCommand(["gnt-instance", "modify", "-t", constants.DT_DRBD8,
                  "-n", inodes[1].primary, name])