diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index 02b62ad80a9385dd84406ad9399e5720c0962724..b2ff4f0b20f0b89feb5c2b6a65e0c086334fd334 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -681,6 +681,10 @@ def TestRapiInstanceRenameAndBack(rename_source, rename_target):
 @InstanceCheck(INST_DOWN, INST_DOWN, FIRST_ARG)
 def TestRapiInstanceReinstall(instance):
   """Test reinstalling an instance via RAPI"""
+  if instance.disk_template == constants.DT_DISKLESS:
+    print qa_utils.FormatInfo("Test not supported for diskless instances")
+    return
+
   _WaitForRapiJob(_rapi_client.ReinstallInstance(instance.name))
   # By default, the instance is started again
   qa_utils.RunInstanceCheck(instance, True)