diff --git a/test/test_generators_yaml.py b/test/test_generators_yaml.py
index 4efb9362..fe50c44a 100644
--- a/test/test_generators_yaml.py
+++ b/test/test_generators_yaml.py
@@ -50,7 +50,7 @@ class TestGeneratorConfig:
     @pytest.mark.parametrize(
         'yamldoc',
         yaml.load_all(
-            Path('test/generator_yaml/invalid_yaml/bad_generators.yaml').read_text(), Loader=yaml.SafeLoader
+            Path('test/yaml/generators/invalid_yaml/bad_generators.yaml').read_text(), Loader=yaml.SafeLoader
         ),
     )
     def test_bad_generators_yamls(self, yamldoc):
diff --git a/test/generator_yaml/invalid_yaml/bad-argument.generators.yaml b/test/yaml/generators/invalid_yaml/bad-argument.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/bad-argument.generators.yaml
rename to test/yaml/generators/invalid_yaml/bad-argument.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/bad.generators.yaml b/test/yaml/generators/invalid_yaml/bad.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/bad.generators.yaml
rename to test/yaml/generators/invalid_yaml/bad.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/bad_casename.generators.yaml b/test/yaml/generators/invalid_yaml/bad_casename.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/bad_casename.generators.yaml
rename to test/yaml/generators/invalid_yaml/bad_casename.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/bad_generators.yaml b/test/yaml/generators/invalid_yaml/bad_generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/bad_generators.yaml
rename to test/yaml/generators/invalid_yaml/bad_generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/empty-generators.yaml b/test/yaml/generators/invalid_yaml/empty-generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/empty-generators.yaml
rename to test/yaml/generators/invalid_yaml/empty-generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/invalid.generators.yaml b/test/yaml/generators/invalid_yaml/invalid.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/invalid.generators.yaml
rename to test/yaml/generators/invalid_yaml/invalid.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/missing_sample.generators.yaml b/test/yaml/generators/invalid_yaml/missing_sample.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/missing_sample.generators.yaml
rename to test/yaml/generators/invalid_yaml/missing_sample.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/missing_secret.generators.yaml b/test/yaml/generators/invalid_yaml/missing_secret.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/missing_secret.generators.yaml
rename to test/yaml/generators/invalid_yaml/missing_secret.generators.yaml
diff --git a/test/generator_yaml/invalid_yaml/wrong-version.generators.yaml b/test/yaml/generators/invalid_yaml/wrong-version.generators.yaml
similarity index 100%
rename from test/generator_yaml/invalid_yaml/wrong-version.generators.yaml
rename to test/yaml/generators/invalid_yaml/wrong-version.generators.yaml
diff --git a/test/generator_yaml/test_schemata.sh b/test/yaml/generators/test_schemata.sh
similarity index 100%
rename from test/generator_yaml/test_schemata.sh
rename to test/yaml/generators/test_schemata.sh
diff --git a/test/generator_yaml/valid_yaml/minimal-generators.yaml b/test/yaml/generators/valid_yaml/minimal-generators.yaml
similarity index 100%
rename from test/generator_yaml/valid_yaml/minimal-generators.yaml
rename to test/yaml/generators/valid_yaml/minimal-generators.yaml
diff --git a/test/generator_yaml/valid_yaml/oneline.generators.yaml b/test/yaml/generators/valid_yaml/oneline.generators.yaml
similarity index 100%
rename from test/generator_yaml/valid_yaml/oneline.generators.yaml
rename to test/yaml/generators/valid_yaml/oneline.generators.yaml
diff --git a/test/generator_yaml/valid_yaml/paths.generators.yaml b/test/yaml/generators/valid_yaml/paths.generators.yaml
similarity index 100%
rename from test/generator_yaml/valid_yaml/paths.generators.yaml
rename to test/yaml/generators/valid_yaml/paths.generators.yaml
diff --git a/test/generator_yaml/valid_yaml/rich-generators.yaml b/test/yaml/generators/valid_yaml/rich-generators.yaml
similarity index 100%
rename from test/generator_yaml/valid_yaml/rich-generators.yaml
rename to test/yaml/generators/valid_yaml/rich-generators.yaml
diff --git a/test/generator_yaml/valid_yaml/unusual-keys.generators.yaml b/test/yaml/generators/valid_yaml/unusual-keys.generators.yaml
similarity index 100%
rename from test/generator_yaml/valid_yaml/unusual-keys.generators.yaml
rename to test/yaml/generators/valid_yaml/unusual-keys.generators.yaml