diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 102f4e81b8fbc78925035fcaab101f4a02c604c7..37a2e122caced7769f2a5ddf00c623d3570cc7e4 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -248,6 +248,10 @@ def TestInstanceReboot(instance):
 @InstanceCheck(INST_DOWN, INST_DOWN, FIRST_ARG)
 def TestInstanceReinstall(instance):
   """gnt-instance reinstall"""
+  if instance.disk_template == constants.DT_DISKLESS:
+    print qa_utils.FormatInfo("Test not supported for diskless instances")
+    return
+
   AssertCommand(["gnt-instance", "reinstall", "-f", instance.name])
 
   # Test with non-existant OS definition