diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 9b3af1acf..198728fdf 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -22,7 +22,6 @@
 1307
 # Pipelining is deprecated
 530
-536
 584
 1900
 1901
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 1c6a028b9..d43b2772b 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -5492,7 +5492,13 @@ sub disabledtests {
                 next;
             }
             if($_ =~ /(\d+)/) {
-                $disabled{$1}=$1; # disable this test number
+                my ($n) = $1;
+                $disabled{$n}=$n; # disable this test number
+                if(! -f "data/test$n") {
+                    print STDERR "WARNING! Non-exiting test $n in DISABLED!\n";
+                    # fail hard to make user notice
+                    exit 1;
+                }
             }
         }
         close(D);