diff --git a/playbooks/run-test-command/run.yaml b/playbooks/run-test-command/run.yaml
index ceb02475f..d6cdee50d 100644
--- a/playbooks/run-test-command/run.yaml
+++ b/playbooks/run-test-command/run.yaml
@@ -1,6 +1,11 @@
 - hosts: all
 
   tasks:
+    - name: Abort when test_command variable is undefined
+      fail:
+        msg: mandatory test_command variable is undefined
+      when: test_command is undefined
+
     - name: Convert test_command to list
       set_fact:
         test_commands: ['{{ test_command }}']
diff --git a/zuul.d/general-jobs.yaml b/zuul.d/general-jobs.yaml
index d7cd3a41b..5682c01fe 100644
--- a/zuul.d/general-jobs.yaml
+++ b/zuul.d/general-jobs.yaml
@@ -40,8 +40,6 @@
 
          Path to operate in.
     run: playbooks/run-test-command/run.yaml
-    vars:
-      test_command: "exit 1"
 
 - job:
     name: upload-git-mirror