diff --git a/greentest/record_results.py b/greentest/record_results.py
index a40cbf5..76c29c6 100755
--- a/greentest/record_results.py
+++ b/greentest/record_results.py
@@ -7,6 +7,7 @@ import sys
 import os
 import sqlite3
 import warnings
+from greentest.test_support import disabled_marker
 
 warnings.simplefilter('ignore')
 
@@ -38,7 +39,11 @@ def main():
     print arg, 'finished with code', returncode
     stdout = file(output_name).read()
     if not debug:
-        if returncode!=1:
+        if returncode==1:
+            pass
+        elif returncode==8 and disabled_marker in stdout:
+            pass
+        else:
             record(changeset, argv, stdout, returncode)
             os.unlink(output_name)
     sys.exit(returncode)
diff --git a/greentest/test_support.py b/greentest/test_support.py
index 0b4494c..7a0af4d 100644
--- a/greentest/test_support.py
+++ b/greentest/test_support.py
@@ -5,6 +5,10 @@ if __name__ != 'greentest.test_support':
 
 import sys
 
+disabled_marker = '-*-*-*-*-*- disabled -*-*-*-*-*-'
+def exit_disabled():
+    sys.exit(disabled_marker)
+
 class Error(Exception):
     """Base class for regression test exceptions."""