diff --git a/build.gradle b/build.gradle
index f5a3337..cfaacdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1310,17 +1310,23 @@
         if (project.property('tool') == 'r8') {
             exclude "com/android/tools/r8/art/*/d8/**"
             exclude "com/android/tools/r8/jctf/d8/**"
-        } else {
-            assert(project.property('tool') == 'd8')
+            exclude "com/android/tools/r8/jctf/r8cf/**"
+        } else if (project.property('tool') == 'd8') {
             exclude "com/android/tools/r8/art/*/r8/**"
             exclude "com/android/tools/r8/jctf/r8/**"
+            exclude "com/android/tools/r8/jctf/r8cf/**"
+        } else {
+            assert(project.property('tool') == 'r8cf')
+            exclude "com/android/tools/r8/art/*/d8/**"
+            exclude "com/android/tools/r8/art/*/r8/**"
+            exclude "com/android/tools/r8/jctf/d8/**"
+            exclude "com/android/tools/r8/jctf/r8/**"
         }
     }
     if (!project.hasProperty('all_tests')) {
         exclude "com/android/tools/r8/art/dx/**"
         exclude "com/android/tools/r8/art/jack/**"
     }
-    // TODO(tamaskenez) enable jctf on all_tests when consolidated
     if (!project.hasProperty('jctf') && !project.hasProperty('only_jctf')) {
         exclude "com/android/tools/r8/jctf/**"
     }
diff --git a/tools/test.py b/tools/test.py
index 72e7e01..cd9b70f 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -52,14 +52,14 @@
       help='Print a line before a tests starts and after it ends to stdout.',
       default=False, action='store_true')
   result.add_option('--tool',
-      help='Tool to run ART tests with: "r8" (default) or "d8". Ignored if'
-          ' "--all_tests" enabled.',
-      default=None, choices=["r8", "d8"])
+      help='Tool to run ART tests with: "r8" (default) or "d8" or "r8cf"'
+          ' (r8 w/CF-backend). Ignored if "--all_tests" enabled.',
+      default=None, choices=["r8", "d8", "r8cf"])
   result.add_option('--jctf',
-      help='Run JCTF tests with: "r8" (default) or "d8".',
+      help='Run JCTF tests with: "r8" (default) or "d8" or "r8cf".',
       default=False, action='store_true')
   result.add_option('--only-jctf', '--only_jctf',
-      help='Run only JCTF tests with: "r8" (default) or "d8".',
+      help='Run only JCTF tests with: "r8" (default) or "d8" or "r8cf".',
       default=False, action='store_true')
   result.add_option('--jctf-compile-only', '--jctf_compile_only',
       help="Don't run, only compile JCTF tests.",