diff --git a/scripts/setup_official_tests.sh b/scripts/setup_official_tests.sh
index d14ab78ab..0ba8755b0 100755
--- a/scripts/setup_official_tests.sh
+++ b/scripts/setup_official_tests.sh
@@ -9,7 +9,7 @@
 
 set -e
 
-SUBREPO_DIR="tests/official/fixtures"
+SUBREPO_DIR="vendor/nim-eth2-scenarios"
 # verbosity level
 [[ -z "$V" ]] && V=0
 [[ -z "$BUILD_MSG" ]] && BUILD_MSG="Downloading official test vectors"
diff --git a/tests/official/fixtures_utils.nim b/tests/official/fixtures_utils.nim
index 8f58b3dcf..7c931ed91 100644
--- a/tests/official/fixtures_utils.nim
+++ b/tests/official/fixtures_utils.nim
@@ -35,7 +35,7 @@ proc readValue*(r: var JsonReader, a: var seq[byte]) {.inline.} =
 # Test helpers
 
 const
-  FixturesDir* = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
+  FixturesDir* = currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / "vendor" / "nim-eth2-scenarios"
   SszTestsDir* = FixturesDir/"tests-v0.10.1"
 
 proc parseTest*(path: string, Format: typedesc[Json or SSZ], T: typedesc): T =
diff --git a/tests/official/test_fixture_const_sanity_check.nim b/tests/official/test_fixture_const_sanity_check.nim
index c9d4b768b..7df5f9582 100644
--- a/tests/official/test_fixture_const_sanity_check.nim
+++ b/tests/official/test_fixture_const_sanity_check.nim
@@ -14,12 +14,11 @@ import
   # Internals
   ../../beacon_chain/spec/[datatypes, digest],
   # Test utilities
-  ../testutil
+  ../testutil, ./fixtures_utils
 
 const
   SpecDir = currentSourcePath.rsplit(DirSep, 1)[0] /
                   ".."/".."/"beacon_chain"/"spec"
-  FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
   Config = FixturesDir/"tests-v0.10.1"/const_preset/"config.yaml"
 
 type
diff --git a/tests/official/test_fixture_ssz_consensus_objects.nim b/tests/official/test_fixture_ssz_consensus_objects.nim
index 9ae458910..28c79b151 100644
--- a/tests/official/test_fixture_ssz_consensus_objects.nim
+++ b/tests/official/test_fixture_ssz_consensus_objects.nim
@@ -17,7 +17,7 @@ import
   ../../beacon_chain/spec/[crypto, datatypes, digest],
   ../../beacon_chain/ssz,
   # Test utilities
-  ../testutil
+  ../testutil, ./fixtures_utils
 
 # SSZ tests of consensus objects (minimal/mainnet preset specific)
 
@@ -25,7 +25,6 @@ import
 # ----------------------------------------------------------------
 
 const
-  FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
   SSZDir = FixturesDir/"tests-v0.10.1"/const_preset/"phase0"/"ssz_static"
 
 type
diff --git a/tests/official/test_fixture_ssz_generic_types.nim b/tests/official/test_fixture_ssz_generic_types.nim
index bd0360abd..f7f948fc7 100644
--- a/tests/official/test_fixture_ssz_generic_types.nim
+++ b/tests/official/test_fixture_ssz_generic_types.nim
@@ -15,14 +15,14 @@ import
   yaml,
   # Beacon chain internals
   ../../beacon_chain/spec/[datatypes, digest],
-  ../../beacon_chain/ssz
+  ../../beacon_chain/ssz,
   # Test utilities
+  ./fixtures_utils
 
 # Parsing definitions
 # ------------------------------------------------------------------------
 
 const
-  FixturesDir = currentSourcePath.rsplit(DirSep, 1)[0] / "fixtures"
   SSZDir = FixturesDir/"tests-v0.10.1"/"general"/"phase0"/"ssz_generic"
 
 type