diff --git a/tests/generators/finality/main.py b/tests/generators/finality/main.py
index dca0ecb8d..ef2d8293f 100644
--- a/tests/generators/finality/main.py
+++ b/tests/generators/finality/main.py
@@ -4,7 +4,7 @@ from importlib import reload
 from gen_base import gen_runner, gen_typing
 from gen_from_tests.gen import generate_from_tests
 
-from eth2spec.test.context import PHASE0
+from eth2spec.test.context import PHASE0, PHASE1
 from eth2spec.test.phase0.finality import test_finality
 from eth2spec.config import config_util
 from eth2spec.phase0 import spec as spec_phase0
@@ -12,7 +12,7 @@ from eth2spec.phase1 import spec as spec_phase1
 from eth2spec.utils import bls
 
 
-def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
+def create_provider(fork_name: str, handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
 
     def prepare_fn(configs_path: str) -> str:
         config_util.prepare_config(configs_path, config_name)
@@ -26,14 +26,18 @@ def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typin
             runner_name='finality',
             handler_name=handler_name,
             src=tests_src,
-            fork_name=PHASE0,
+            fork_name=fork_name,
         )
 
     return gen_typing.TestProvider(prepare=prepare_fn, make_cases=cases_fn)
 
 
 if __name__ == "__main__":
+    # No additional phase 1 specific rewards tests, yet.
+    key = 'finality'
     gen_runner.run_generator("finality", [
-        create_provider('finality', test_finality, 'minimal'),
-        create_provider('finality', test_finality, 'mainnet'),
+        create_provider(PHASE0, 'finality', test_finality, 'minimal'),
+        create_provider(PHASE0, 'finality', test_finality, 'mainnet'),
+        create_provider(PHASE1, 'finality', test_finality, 'minimal'),
+        create_provider(PHASE1, 'finality', test_finality, 'mainnet'),
     ])
diff --git a/tests/generators/rewards/main.py b/tests/generators/rewards/main.py
index 30554358b..b07092d68 100644
--- a/tests/generators/rewards/main.py
+++ b/tests/generators/rewards/main.py
@@ -45,15 +45,12 @@ if __name__ == "__main__":
     gen_runner.run_generator(f"rewards", [
         create_provider(PHASE0, key, mod_name, 'minimal') for key, mod_name in phase_0_mods
     ])
-    # TODO: disabled for testing
-    # gen_runner.run_generator(f"rewards", [
-    #     create_provider(key, mod_name, 'mainnet') for key, mod_name in phase_0_mods
-    # ])
+    gen_runner.run_generator(f"rewards", [
+        create_provider(PHASE0, key, mod_name, 'mainnet') for key, mod_name in phase_0_mods
+    ])
     gen_runner.run_generator(f"rewards", [
         create_provider(PHASE1, key, mod_name, 'minimal') for key, mod_name in phase_1_mods
     ])
-    # Disabled for now
-    # gen_runner.run_generator(f"rewards", [
-    #     create_provider(PHASE1, key, mod_name, 'mainnet') for key, mod_name in phase_1_mods
-    # ])
-
+    gen_runner.run_generator(f"rewards", [
+        create_provider(PHASE1, key, mod_name, 'mainnet') for key, mod_name in phase_1_mods
+    ])