diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py
index cf12425902f..dc2a435c2f0 100644
--- a/utils/lit/lit/Test.py
+++ b/utils/lit/lit/Test.py
@@ -20,12 +20,6 @@ UNSUPPORTED = TestResult('UNSUPPORTED', False)
 
 # Test classes.
 
-class TestFormat:
-    """TestFormat - Test information provider."""
-
-    def __init__(self, name):
-        self.name = name
-
 class TestSuite:
     """TestSuite - Information on a group of tests.
 
diff --git a/utils/lit/lit/formats/__init__.py b/utils/lit/lit/formats/__init__.py
index f4a303c4c5d..68627084176 100644
--- a/utils/lit/lit/formats/__init__.py
+++ b/utils/lit/lit/formats/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
-from lit.formats.base import FileBasedTest, OneCommandPerFileTest
+from lit.formats.base import TestFormat, FileBasedTest, OneCommandPerFileTest
 from lit.formats.googletest import GoogleTest
 from lit.formats.shtest import ShTest
diff --git a/utils/lit/lit/formats/base.py b/utils/lit/lit/formats/base.py
index b384ec2f0ce..9e5420ba767 100644
--- a/utils/lit/lit/formats/base.py
+++ b/utils/lit/lit/formats/base.py
@@ -5,7 +5,12 @@ import sys
 import lit.Test
 import lit.util
 
-class FileBasedTest(object):
+class TestFormat(object):
+    pass
+
+###
+
+class FileBasedTest(TestFormat):
     def getTestsInDirectory(self, testSuite, path_in_suite,
                             litConfig, localConfig):
         source_path = testSuite.getSourcePath(path_in_suite)
@@ -27,7 +32,7 @@ class FileBasedTest(object):
 import re
 import tempfile
 
-class OneCommandPerFileTest:
+class OneCommandPerFileTest(TestFormat):
     # FIXME: Refactor into generic test for running some command on a directory
     # of inputs.
 
diff --git a/utils/lit/lit/formats/googletest.py b/utils/lit/lit/formats/googletest.py
index 8465a0b9090..b77e184d2f6 100644
--- a/utils/lit/lit/formats/googletest.py
+++ b/utils/lit/lit/formats/googletest.py
@@ -5,10 +5,11 @@ import sys
 import lit.Test
 import lit.TestRunner
 import lit.util
+from .base import TestFormat
 
 kIsWindows = sys.platform in ['win32', 'cygwin']
 
-class GoogleTest(object):
+class GoogleTest(TestFormat):
     def __init__(self, test_sub_dir, test_suffix):
         self.test_sub_dir = os.path.normcase(str(test_sub_dir)).split(';')
         self.test_suffix = str(test_suffix)