diff --git a/.gitignore b/.gitignore
index ce047240a..3dd86fc80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ venv
 build/
 output/
 
-yaml_tests/
+eth2.0-spec-tests/
 .pytest_cache
 
 # Dynamically built from Markdown spec
diff --git a/Makefile b/Makefile
index 0a3e03e33..b93c7ea95 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SPEC_DIR = ./specs
 SCRIPT_DIR = ./scripts
 TEST_LIBS_DIR = ./test_libs
 PY_SPEC_DIR = $(TEST_LIBS_DIR)/pyspec
-YAML_TEST_DIR = ./yaml_tests
+YAML_TEST_DIR = ./eth2.0-spec-tests/tests
 GENERATOR_DIR = ./test_generators
 CONFIGS_DIR = ./configs