diff --git a/src/script_opt/CPP/maint/find-test-files.sh b/src/script_opt/CPP/maint/find-test-files.sh
index bf848db4ec..a1c4b1ccd4 100755
--- a/src/script_opt/CPP/maint/find-test-files.sh
+++ b/src/script_opt/CPP/maint/find-test-files.sh
@@ -4,7 +4,7 @@ find ../testing/btest -type f |
     grep -v '\.tmp/' |
     xargs grep -E -l '@TEST' |
     xargs grep -E -l '^[ 	]*(event|print)' |
-    xargs grep -E -c 'REQUIRES.*CPP.*((!=.*1)|(==.*0))' |
+    xargs grep -E -c '(REQUIRES.*CPP.*((!=.*1)|(==.*0)))|@TEST-START-NEXT' |
     grep ':0$' |
     sed 's,:0,,' |
     sort