diff --git a/mypy/test/testtypegen.py b/mypy/test/testtypegen.py
index e60d2e76d8fa..7376d51913ef 100644
--- a/mypy/test/testtypegen.py
+++ b/mypy/test/testtypegen.py
@@ -7,9 +7,8 @@
 
 from mypy import build
 from mypy.build import BuildSource
-from mypy.myunit import Suite
 from mypy.test import config
-from mypy.test.data import parse_test_cases, DataDrivenTestCase
+from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal
 from mypy.util import short_type
 from mypy.nodes import (
@@ -20,18 +19,19 @@
 from mypy.options import Options
 
 
-class TypeExportSuite(Suite):
+class TypeExportSuite(DataSuite):
     # List of files that contain test case descriptions.
     files = ['typexport-basic.test']
 
-    def cases(self) -> List[DataDrivenTestCase]:
+    @classmethod
+    def cases(cls) -> List[DataDrivenTestCase]:
         c = []  # type: List[DataDrivenTestCase]
-        for f in self.files:
+        for f in cls.files:
             c += parse_test_cases(os.path.join(config.test_data_prefix, f),
-                                  self.run_test, config.test_temp_dir)
+                                  None, config.test_temp_dir)
         return c
 
-    def run_test(self, testcase: DataDrivenTestCase) -> None:
+    def run_case(self, testcase: DataDrivenTestCase) -> None:
         try:
             line = testcase.input[0]
             mask = ''
diff --git a/runtests.py b/runtests.py
index c42899b21a7f..bb32c8503143 100755
--- a/runtests.py
+++ b/runtests.py
@@ -205,6 +205,7 @@ def add_imports(driver: Driver) -> None:
     'testfinegrained',
     'testmerge',
     'testtransform',
+    'testtypegen',
     'testparse',
 ]]