diff --git a/tests/runtests.pl b/tests/runtests.pl
index 5456a87327be205b4eb33000f392d781d5195e0f..18c65c9f446b9122979b194b2e31910cdecd2866 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1823,7 +1823,14 @@ sub singletest {
 
     my $dbghosttype=join(' ', runclientoutput("uname -a"));
     if(($dbghosttype =~ /SMP PREEMPT/) && ($dbghosttype =~ /i686 GNU/)) {
-        $why = "debugging icc build" if(($testnum != 1) && ($testnum != 100));
+        if(!$curl_debug) {
+            if(($testnum != 1)   && ($testnum != 100) &&
+               ($testnum != 500) && ($testnum != 507) &&
+               ($testnum != 517) && ($testnum != 534) &&
+               ($testnum != 557) && ($testnum != 1013)) {
+                $why = "debugging icc build";
+            }
+        }
     }
 
     if(!$why) {