diff --git a/tests/runtests.pl b/tests/runtests.pl
index cc308e7ba3..f135d5137d 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -4141,6 +4141,12 @@ sub singletest {
         $DBGCURL=$CMDLINE;
     }
 
+    if($fail_due_event_based) {
+        logmsg "This test cannot run event based\n";
+        timestampskippedevents($testnum);
+        return -1;
+    }
+
     if($gdbthis) {
         # gdb is incompatible with valgrind, so disable it when debugging
         # Perhaps a better approach would be to run it under valgrind anyway
@@ -4148,11 +4154,6 @@ sub singletest {
         $disablevalgrind=1;
     }
 
-    if($fail_due_event_based) {
-        logmsg "This test cannot run event based\n";
-        return -1;
-    }
-
     my @stdintest = getpart("client", "stdin");
 
     if(@stdintest) {