diff --git a/tools/test.py b/tools/test.py
index 4d6337037aa7f2..6b0a4d693fe4fd 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -49,6 +49,7 @@
 from Queue import Queue, Empty
 
 logger = logging.getLogger('testrunner')
+skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)
 
 VERBOSE = False
 
@@ -256,7 +257,12 @@ def HasRun(self, output):
       for l in output.output.stdout.splitlines():
         logger.info('#' + l)
     else:
-      logger.info('ok %i - %s' % (self._done, command))
+      skip = skip_regex.search(output.output.stdout)
+      if skip:
+        logger.info('ok %i - %s # skip %s' %
+          (self._done, command, skip.group(1)))
+      else:
+        logger.info('ok %i - %s' % (self._done, command))
 
     duration = output.test.duration