diff --git a/tests/core/gen_helpers/README.md b/tests/core/pyspec/eth2spec/gen_helpers/README.md
similarity index 100%
rename from tests/core/gen_helpers/README.md
rename to tests/core/pyspec/eth2spec/gen_helpers/README.md
diff --git a/tests/core/gen_helpers/gen_base/__init__.py b/tests/core/pyspec/eth2spec/gen_helpers/__init__.py
similarity index 100%
rename from tests/core/gen_helpers/gen_base/__init__.py
rename to tests/core/pyspec/eth2spec/gen_helpers/__init__.py
diff --git a/tests/core/gen_helpers/gen_from_tests/__init__.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_base/__init__.py
similarity index 100%
rename from tests/core/gen_helpers/gen_from_tests/__init__.py
rename to tests/core/pyspec/eth2spec/gen_helpers/gen_base/__init__.py
diff --git a/tests/core/gen_helpers/gen_base/gen_runner.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_runner.py
similarity index 95%
rename from tests/core/gen_helpers/gen_base/gen_runner.py
rename to tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_runner.py
index a22073c00..26427c6f8 100644
--- a/tests/core/gen_helpers/gen_base/gen_runner.py
+++ b/tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_runner.py
@@ -8,11 +8,11 @@ from ruamel.yaml import (
     YAML,
 )
 
-from gen_base.gen_typing import TestProvider
-
 from eth2spec.test import context
 from eth2spec.test.exceptions import SkippedTest
 
+from .gen_typing import TestProvider
+
 
 # Flag that the runner does NOT run test via pytest
 context.is_pytest = False
@@ -119,10 +119,11 @@ def run_generator(generator_name, test_providers: Iterable[TestProvider]):
 
         print(f"generating tests with config '{config_name}' ...")
         for test_case in tprov.make_cases():
-            case_dir = Path(output_dir) / Path(config_name) / Path(test_case.fork_name) \
-                       / Path(test_case.runner_name) / Path(test_case.handler_name) \
-                       / Path(test_case.suite_name) / Path(test_case.case_name)
-
+            case_dir = (
+                Path(output_dir) / Path(config_name) / Path(test_case.fork_name)
+                / Path(test_case.runner_name) / Path(test_case.handler_name)
+                / Path(test_case.suite_name) / Path(test_case.case_name)
+            )
             if case_dir.exists():
                 if not args.force:
                     print(f'Skipping already existing test: {case_dir}')
diff --git a/tests/core/gen_helpers/gen_base/gen_typing.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_typing.py
similarity index 100%
rename from tests/core/gen_helpers/gen_base/gen_typing.py
rename to tests/core/pyspec/eth2spec/gen_helpers/gen_base/gen_typing.py
diff --git a/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/__init__.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/core/gen_helpers/gen_from_tests/gen.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
similarity index 92%
rename from tests/core/gen_helpers/gen_from_tests/gen.py
rename to tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
index 3ec8904fc..f5a0f378b 100644
--- a/tests/core/gen_helpers/gen_from_tests/gen.py
+++ b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py
@@ -4,10 +4,10 @@ from typing import Any, Callable, Dict, Iterable
 
 from eth2spec.config import config_util
 from eth2spec.utils import bls
-
 from eth2spec.test.context import ALL_CONFIGS, TESTGEN_FORKS, SpecForkName, ConfigName
-from gen_base import gen_runner
-from gen_base.gen_typing import TestCase, TestProvider
+
+from eth2spec.gen_helpers.gen_base import gen_runner
+from eth2spec.gen_helpers.gen_base.gen_typing import TestCase, TestProvider
 
 
 def generate_from_tests(runner_name: str, handler_name: str, src: Any,
@@ -56,11 +56,12 @@ def get_provider(create_provider_fn: Callable[[SpecForkName, str, str, ConfigNam
             handler_name=key,
             tests_src_mod_name=mod_name,
             config_name=config_name,
-    )
+        )
 
 
-def get_create_provider_fn(runner_name: str, config_name: ConfigName, specs: Iterable[Any]
-    ) -> Callable[[SpecForkName, str, str, ConfigName], TestProvider]:
+def get_create_provider_fn(
+        runner_name: str, config_name: ConfigName, specs: Iterable[Any]
+) -> Callable[[SpecForkName, str, str, ConfigName], TestProvider]:
     def prepare_fn(configs_path: str) -> str:
         config_util.prepare_config(configs_path, config_name)
         for spec in specs:
diff --git a/tests/core/gen_helpers/requirements.txt b/tests/core/pyspec/eth2spec/gen_helpers/requirements.txt
similarity index 100%
rename from tests/core/gen_helpers/requirements.txt
rename to tests/core/pyspec/eth2spec/gen_helpers/requirements.txt
diff --git a/tests/core/gen_helpers/setup.py b/tests/core/pyspec/eth2spec/gen_helpers/setup.py
similarity index 100%
rename from tests/core/gen_helpers/setup.py
rename to tests/core/pyspec/eth2spec/gen_helpers/setup.py
diff --git a/tests/generators/README.md b/tests/generators/README.md
index 077a8443c..b819d93b8 100644
--- a/tests/generators/README.md
+++ b/tests/generators/README.md
@@ -103,7 +103,7 @@ Write a `main.py` file. The shuffling test generator is a good minimal starting
 ```python
 from eth2spec.phase0 import spec as spec
 from eth_utils import to_tuple
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 from preset_loader import loader
 from typing import Iterable
 
diff --git a/tests/generators/bls/main.py b/tests/generators/bls/main.py
index 6552b8654..fecc2df7d 100644
--- a/tests/generators/bls/main.py
+++ b/tests/generators/bls/main.py
@@ -13,7 +13,7 @@ import milagro_bls_binding as milagro_bls
 
 from eth2spec.utils import bls
 from eth2spec.test.context import PHASE0
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 
 def to_bytes(i):
diff --git a/tests/generators/bls/requirements.txt b/tests/generators/bls/requirements.txt
index 5f830773a..df386450b 100644
--- a/tests/generators/bls/requirements.txt
+++ b/tests/generators/bls/requirements.txt
@@ -1,4 +1,2 @@
-py_ecc==5.1.0
-eth-utils==1.6.0
-../../core/gen_helpers
+pytest>=4.4
 ../../../
diff --git a/tests/generators/epoch_processing/main.py b/tests/generators/epoch_processing/main.py
index 1306da523..50a1e2b57 100644
--- a/tests/generators/epoch_processing/main.py
+++ b/tests/generators/epoch_processing/main.py
@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
diff --git a/tests/generators/epoch_processing/requirements.txt b/tests/generators/epoch_processing/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/epoch_processing/requirements.txt
+++ b/tests/generators/epoch_processing/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/finality/main.py b/tests/generators/finality/main.py
index 0a62b1aa5..8b961f9f4 100644
--- a/tests/generators/finality/main.py
+++ b/tests/generators/finality/main.py
@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
diff --git a/tests/generators/finality/requirements.txt b/tests/generators/finality/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/finality/requirements.txt
+++ b/tests/generators/finality/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/genesis/main.py b/tests/generators/genesis/main.py
index ce055b44a..854af6572 100644
--- a/tests/generators/genesis/main.py
+++ b/tests/generators/genesis/main.py
@@ -3,8 +3,8 @@ from typing import Iterable
 from eth2spec.test.context import PHASE0
 from eth2spec.test.phase0.genesis import test_initialization, test_validity
 
-from gen_base import gen_runner, gen_typing
-from gen_from_tests.gen import generate_from_tests
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_from_tests.gen import generate_from_tests
 from eth2spec.phase0 import spec as spec
 from importlib import reload
 from eth2spec.config import config_util
diff --git a/tests/generators/genesis/requirements.txt b/tests/generators/genesis/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/genesis/requirements.txt
+++ b/tests/generators/genesis/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/operations/main.py b/tests/generators/operations/main.py
index d40dbe9cd..00a58288f 100644
--- a/tests/generators/operations/main.py
+++ b/tests/generators/operations/main.py
@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
diff --git a/tests/generators/operations/requirements.txt b/tests/generators/operations/requirements.txt
index a6ea61aea..df386450b 100644
--- a/tests/generators/operations/requirements.txt
+++ b/tests/generators/operations/requirements.txt
@@ -1,3 +1,2 @@
-eth-utils==1.6.0
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/rewards/main.py b/tests/generators/rewards/main.py
index addb6aef0..4124587cc 100644
--- a/tests/generators/rewards/main.py
+++ b/tests/generators/rewards/main.py
@@ -1,4 +1,4 @@
-from gen_from_tests.gen import run_state_test_generators
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
diff --git a/tests/generators/rewards/requirements.txt b/tests/generators/rewards/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/rewards/requirements.txt
+++ b/tests/generators/rewards/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/sanity/main.py b/tests/generators/sanity/main.py
index fc5227a53..5155798ff 100644
--- a/tests/generators/sanity/main.py
+++ b/tests/generators/sanity/main.py
@@ -1,9 +1,10 @@
-from gen_from_tests.gen import run_state_test_generators
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.lightclient_patch import spec as spec_lightclient_patch
 from eth2spec.phase1 import spec as spec_phase1
 from eth2spec.test.context import PHASE0, PHASE1, LIGHTCLIENT_PATCH
 
+from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
+
 
 specs = (spec_phase0, spec_lightclient_patch, spec_phase1)
 
diff --git a/tests/generators/sanity/requirements.txt b/tests/generators/sanity/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/sanity/requirements.txt
+++ b/tests/generators/sanity/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../
diff --git a/tests/generators/shuffling/main.py b/tests/generators/shuffling/main.py
index 6069de77a..091207bca 100644
--- a/tests/generators/shuffling/main.py
+++ b/tests/generators/shuffling/main.py
@@ -2,7 +2,7 @@ from eth_utils import to_tuple
 from typing import Iterable
 from importlib import reload
 
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 from eth2spec.config import config_util
 from eth2spec.phase0 import spec as spec
diff --git a/tests/generators/ssz_generic/main.py b/tests/generators/ssz_generic/main.py
index 8cfb2e3eb..737f8cda6 100644
--- a/tests/generators/ssz_generic/main.py
+++ b/tests/generators/ssz_generic/main.py
@@ -1,5 +1,5 @@
 from typing import Iterable
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 import ssz_basic_vector
 import ssz_bitlist
 import ssz_bitvector
diff --git a/tests/generators/ssz_generic/requirements.txt b/tests/generators/ssz_generic/requirements.txt
index af061a3b1..df386450b 100644
--- a/tests/generators/ssz_generic/requirements.txt
+++ b/tests/generators/ssz_generic/requirements.txt
@@ -1,3 +1,2 @@
-eth-utils==1.6.0
-../../core/gen_helpers
+pytest>=4.4
 ../../../
diff --git a/tests/generators/ssz_static/main.py b/tests/generators/ssz_static/main.py
index 38ff18615..8b18705e7 100644
--- a/tests/generators/ssz_static/main.py
+++ b/tests/generators/ssz_static/main.py
@@ -3,7 +3,7 @@ from typing import Iterable
 from importlib import reload
 from inspect import getmembers, isclass
 
-from gen_base import gen_runner, gen_typing
+from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 
 from eth2spec.debug import random_value, encode
 from eth2spec.config import config_util
diff --git a/tests/generators/ssz_static/requirements.txt b/tests/generators/ssz_static/requirements.txt
index b82314298..df386450b 100644
--- a/tests/generators/ssz_static/requirements.txt
+++ b/tests/generators/ssz_static/requirements.txt
@@ -1,2 +1,2 @@
-../../core/gen_helpers
-../../../
\ No newline at end of file
+pytest>=4.4
+../../../