diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b75477987..2e1df8b1e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -93,14 +93,11 @@ jobs:
     smoke-test:
       name: smoke-test
       runs-on: ubuntu-22.04-github-hosted-16core
-      env:
-        TEST_REPO_DIR: test-repo
-  
+
       steps:
       - name: Checkout code
         uses: actions/checkout@v4 
         with:
-          path: ${{ env.TEST_REPO_DIR }}
           ref: ${{ github.event.pull_request.head.sha }}
       
       - name: Install Rust
@@ -108,15 +105,14 @@ jobs:
         with:
           toolchain: nightly-2023-09-21
       
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+        
       - name: Run smoke-test
         env:
-          TEST_REPO: ${{ github.event.repository.name }}
-          TEST_REPO_DIR: "../${{ env.TEST_REPO_DIR }}"
           RUST_BACKTRACE: full
-        run: |
-          git clone https://github.com/matter-labs/zkfoundry-smoke-test
-          cd zkfoundry-smoke-test
-          ./smoke-test.sh
+        run: cd smoke-test && ./test.sh
 
     cheatcodes:
       name: cheatcode-test
diff --git a/.gitmodules b/.gitmodules
index c0e956c61..87c9122a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "crates/era-cheatcodes/tests/lib/forge-std"]
 	path = crates/era-cheatcodes/tests/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "smoke-test/lib/forge-std"]
+	path = smoke-test/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/smoke-test/.gitignore b/smoke-test/.gitignore
new file mode 100644
index 000000000..2cb09d77f
--- /dev/null
+++ b/smoke-test/.gitignore
@@ -0,0 +1,3 @@
+zkout/
+solc-v*
+*.log
diff --git a/smoke-test/lib/forge-std b/smoke-test/lib/forge-std
new file mode 160000
index 000000000..80a8f6ea9
--- /dev/null
+++ b/smoke-test/lib/forge-std
@@ -0,0 +1 @@
+Subproject commit 80a8f6ea9362849b2a8f2dc28df40c77a64f9c16