diff --git a/test_generators/genesis/main.py b/test_generators/genesis/main.py
index 82899b967..6091a63d8 100644
--- a/test_generators/genesis/main.py
+++ b/test_generators/genesis/main.py
@@ -1,33 +1,34 @@
-from typing import Callable, Iterable
+from typing import Iterable
 
 from eth2spec.test.genesis import test_initialization, test_validity
 
-from gen_base import gen_runner, gen_suite, gen_typing
+from gen_base import gen_runner, gen_typing
 from gen_from_tests.gen import generate_from_tests
 from preset_loader import loader
 from eth2spec.phase0 import spec as spec
 
 
-def create_suite(handler_name: str, config_name: str, get_cases: Callable[[], Iterable[gen_typing.TestCase]]) \
-        -> Callable[[str], gen_typing.TestSuiteOutput]:
-    def suite_definition(configs_path: str) -> gen_typing.TestSuiteOutput:
-        presets = loader.load_presets(configs_path, config_name)
-        spec.apply_constants_preset(presets)
+def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
 
-        return ("genesis_%s_%s" % (handler_name, config_name), handler_name, gen_suite.render_suite(
-            title="genesis testing",
-            summary="Genesis test suite, %s type, generated from pytests" % handler_name,
-            forks_timeline="testing",
-            forks=["phase0"],
-            config=config_name,
-            runner="genesis",
-            handler=handler_name,
-            test_cases=get_cases()))
-    return suite_definition
+    def prepare_fn(configs_path: str) -> str:
+        presets = loader.load_presets(configs_path, config_name)
+        spec_phase0.apply_constants_preset(presets)
+        spec_phase1.apply_constants_preset(presets)
+        return config_name
+
+    def cases_fn() -> Iterable[gen_typing.TestCase]:
+        return generate_from_tests(
+            runner_name='genesis',
+            handler_name=handler_name,
+            src=tests_src,
+            fork_name='phase0'
+        )
+
+    return gen_typing.TestProvider(prepare=prepare_fn, make_cases=cases_fn)
 
 
 if __name__ == "__main__":
     gen_runner.run_generator("genesis", [
-        create_suite('initialization', 'minimal', lambda: generate_from_tests(test_initialization, 'phase0')),
-        create_suite('validity', 'minimal', lambda: generate_from_tests(test_validity, 'phase0')),
+        create_provider('initialization', test_initialization, 'minimal'),
+        create_provider('validity', test_validity, 'minimal'),
     ])