diff --git a/tools/test.py b/tools/test.py
index af88bc55cc0..9d7838d7c01 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -83,7 +83,7 @@ except ImportError:
 
 
 logger = logging.getLogger('testrunner')
-skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)
+skip_regex = re.compile(r'(?:\d+\.\.\d+|ok|not ok).*# SKIP\S*\s+(.*)', re.IGNORECASE)
 
 VERBOSE = False