diff --git a/circle.yml b/circle.yml
index e610211962..c6d7d97166 100644
--- a/circle.yml
+++ b/circle.yml
@@ -343,12 +343,24 @@ jobs:
       CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-Og
     steps:
       - build
-      - download_consensus_tests:
-          rev: v10.4
+      - run:
+          # TODO: Merge with download_consensus_tests
+          name: "Download tests"
+          working_directory: ~/tests
+          command: |
+            git clone --depth=50 --single-branch https://github.com/ethereum/tests .
+            git checkout cde14b047d0d2549ed8fd46b4946aed0ec938cbf
+            git submodule init LegacyTests
+            git config -f .gitmodules submodule.LegacyTests.shallow true
+            git submodule update
       - run:
           name: "State tests"
           working_directory: ~/build
           command: bin/evmone-statetest ~/tests/GeneralStateTests
+      - run:
+          name: "State tests (legacy)"
+          working_directory: ~/build
+          command: bin/evmone-statetest ~/tests/LegacyTests/Constantinople/GeneralStateTests
       - collect_coverage_gcc
       - upload_coverage:
           flags: statetests