diff --git a/tests/scripts/generate_bignum_tests.py b/tests/scripts/generate_bignum_tests.py
index b08ba37..f613680 100755
--- a/tests/scripts/generate_bignum_tests.py
+++ b/tests/scripts/generate_bignum_tests.py
@@ -231,12 +231,5 @@
         return quote_str(hex(self.int_l + self.int_r).replace("0x", "", 1))
 
 
-class BignumTestGenerator(test_generation.TestGenerator):
-    """Test generator subclass, for bignum file Targets."""
-    TARGETS = {
-        subclass.target_basename: subclass.generate_tests for subclass in
-        test_generation.BaseTarget.__subclasses__()
-    } # type: Dict[str, Callable[[], Iterable[test_case.TestCase]]]
-
 if __name__ == '__main__':
-    test_generation.main(sys.argv[1:], BignumTestGenerator)
+    test_generation.main(sys.argv[1:])
diff --git a/tests/scripts/generate_psa_tests.py b/tests/scripts/generate_psa_tests.py
index ebec2ee..1f516c9 100755
--- a/tests/scripts/generate_psa_tests.py
+++ b/tests/scripts/generate_psa_tests.py
@@ -898,7 +898,7 @@
     """Test generator subclass including PSA targets and info."""
     # Note that targets whose names contain 'test_format' have their content
     # validated by `abi_check.py`.
-    TARGETS = {
+    targets = {
         'test_suite_psa_crypto_generate_key.generated':
         lambda info: KeyGenerate(info).test_cases_for_key_generation(),
         'test_suite_psa_crypto_not_supported.generated':