diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 1161fcb5e..e829433d4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Rustfmt
       run: cargo fmt --all -- --check
     - name: Clippy
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Build
       run: cargo build --verbose
     - name: Build NoStd
@@ -32,17 +32,10 @@ jobs:
   jsontests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
-        repository: "rust-blockchain/evm-tests"
         submodules: recursive
-    - name: Submodules
-      run: |
-        cd evm
-        git remote set-url origin "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-        git fetch origin $GITHUB_SHA
-        git checkout $GITHUB_SHA
     - name: Run tests
       run: |
-        cd jsontests
-        cargo test --release --verbose
+        cd evm-tests/jsontests
+        cargo test --release
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..922479e36
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "evm-tests"]
+	path = evm-tests
+	url = https://github.com/aurora-is-near/evm-tests.git
diff --git a/evm-tests b/evm-tests
new file mode 160000
index 000000000..b35875ca2
--- /dev/null
+++ b/evm-tests
@@ -0,0 +1 @@
+Subproject commit b35875ca23e1d9fdd17a6c36532c0aace62397f8