diff --git a/qa/qa_config.py b/qa/qa_config.py
index 5f0a8ac9250c7d34cc7d8e6db009c0941bf65afc..a180b329aa11357bebb076c942f5bcb799a8225d 100644
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -51,6 +51,11 @@ def Validate():
   if len(cfg['instances']) < 1:
     raise qa_error.Error("Need at least one instance")
 
+  if (TestEnabled('instance-add-remote-raid-disk') and
+      TestEnabled('instance-add-drbd-disk')):
+    raise qa_error.Error('Tests for disk templates remote_raid1 and drbd'
+                         ' cannot be enabled at the same time.')
+
 
 def get(name, default=None):
   return cfg.get(name, default)