diff --git a/test_generators/genesis/README.md b/test_generators/genesis/README.md
new file mode 100644
index 000000000..8a2b01c62
--- /dev/null
+++ b/test_generators/genesis/README.md
@@ -0,0 +1,8 @@
+# Genesis test generator
+
+Genesis tests cover the initialization and validity-based launch trigger for the Beacon Chain genesis state.
+
+Information on the format of the tests can be found in the [genesis test formats documentation](../../specs/test_formats/genesis/README.md).
+
+ 
+
diff --git a/test_generators/genesis/main.py b/test_generators/genesis/main.py
new file mode 100644
index 000000000..82899b967
--- /dev/null
+++ b/test_generators/genesis/main.py
@@ -0,0 +1,33 @@
+from typing import Callable, Iterable
+
+from eth2spec.test.genesis import test_initialization, test_validity
+
+from gen_base import gen_runner, gen_suite, 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)
+
+        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
+
+
+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')),
+    ])
diff --git a/test_generators/genesis/requirements.txt b/test_generators/genesis/requirements.txt
new file mode 100644
index 000000000..595cee69c
--- /dev/null
+++ b/test_generators/genesis/requirements.txt
@@ -0,0 +1,4 @@
+eth-utils==1.6.0
+../../test_libs/gen_helpers
+../../test_libs/config_helpers
+../../test_libs/pyspec
\ No newline at end of file
diff --git a/test_libs/pyspec/eth2spec/test/genesis/test_initialize_beacon_state_from_eth1.py b/test_libs/pyspec/eth2spec/test/genesis/test_initialization.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/genesis/test_initialize_beacon_state_from_eth1.py
rename to test_libs/pyspec/eth2spec/test/genesis/test_initialization.py
diff --git a/test_libs/pyspec/eth2spec/test/genesis/test_is_valid_genesis_state.py b/test_libs/pyspec/eth2spec/test/genesis/test_validity.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/genesis/test_is_valid_genesis_state.py
rename to test_libs/pyspec/eth2spec/test/genesis/test_validity.py