diff --git a/Testsuite/test/collect_cgal_testresults b/Testsuite/test/collect_cgal_testresults
index 83c7b784da7..bcdb1211a23 100755
--- a/Testsuite/test/collect_cgal_testresults
+++ b/Testsuite/test/collect_cgal_testresults
@@ -56,7 +56,7 @@ print_testresult()
       # string "warning" preceded with a letter that is not a letter or '_' or ','
       # That avoids some false positives such as
       # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS'
-      if $GREP -i -E '[^a-zA-Z_,]warning' "CompilerOutput_$1" "ErrorOutput_$1" > /dev/null ; then
+      if $GREP -i -E '[^a-zA-Z_,]warning' "CompilerOutput_$1" ProgramOutput.*.$1 > /dev/null ; then
         RESULT="w"
       else
         RESULT="y"
diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake
index 149e364b2ca..a273e2424af 100755
--- a/Testsuite/test/collect_cgal_testresults_from_cmake
+++ b/Testsuite/test/collect_cgal_testresults_from_cmake
@@ -44,7 +44,7 @@ print_testresult()
       # string "warning" preceded with a letter that is not a letter or '_' or ','
       # That avoids some false positives such as
       # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS'
-      if grep -i -E -q '[^a-zA-Z_,]warning' CompilerOutput_$1 
+      if grep -i -E -q '[^a-zA-Z_,]warning' CompilerOutput_$1 ProgramOutput.*.$1 
       then
         RESULT="w"
       else