Index: litsupport/test.py
===================================================================
--- litsupport/test.py
+++ litsupport/test.py
@@ -13,9 +13,6 @@
 import os
 
 
-SKIPPED = lit.Test.ResultCode('SKIPPED', False)
-NOEXE = lit.Test.ResultCode('NOEXE', True)
-
 
 class TestSuiteTest(lit.formats.ShTest):
     def __init__(self):
@@ -38,7 +35,7 @@
 
         # Report missing test executables.
         if not os.path.exists(context.executable):
-            return lit.Test.Result(NOEXE, "Executable '%s' is missing" %
+            return lit.Test.Result(lit.Test.NOEXE, "Executable '%s' is missing" %
                                    context.executable)
 
         # Skip unchanged tests
@@ -46,7 +43,7 @@
             litsupport.modules.hash.compute(context)
             if litsupport.modules.hash.same_as_previous(context):
                 result = lit.Test.Result(
-                        SKIPPED, 'Executable identical to previous run')
+                        lit.Test.SKIPPED, 'Executable identical to previous run')
                 val = lit.Test.toMetricValue(context.executable_hash)
                 result.addMetric('hash', val)
                 return result