diff --git a/.github/workflows/cl_vault.yml b/.github/workflows/cl_vault.yml
index 5bcc41ba3..a980f156b 100644
--- a/.github/workflows/cl_vault.yml
+++ b/.github/workflows/cl_vault.yml
@@ -27,29 +27,7 @@ jobs:
     with:
       target: 'contracts/cl-vault'
   test-tube:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-      - name: Restore dependencies
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            ~/.cargo
-            ~/go
-            **/target
-          key: ${{ runner.os }}-cargo-$GITHUB_SHA
-          restore-keys: ${{ runner.os }}-cargo
-      - name: Build dex-router-osmosis
-        run: cargo test-tube-build
-        working-directory: smart-contracts/contracts/dex-router-osmosis
-      - name: Build cl-vault
-        run: cargo test-tube-build
-        working-directory: smart-contracts/contracts/cl-vault
-      - name: Run test-tube tests
-        run: cargo test-tube
-        env:
-          PROPTEST_CASES: 10
-        working-directory: smart-contracts/contracts/cl-vault
+    uses: ./.github/workflows/rust_test_tube.yml
+    with:
+      contract: 'cl-vault'
+      dex_router_osmosis: true
diff --git a/.github/workflows/rust_test_tube.yml b/.github/workflows/rust_test_tube.yml
index 4ee2ef265..d1f8dca91 100644
--- a/.github/workflows/rust_test_tube.yml
+++ b/.github/workflows/rust_test_tube.yml
@@ -6,6 +6,10 @@ on:
       contract:
         required: true
         type: string
+      dex_router_osmosis:
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   test-tube:
@@ -27,6 +31,14 @@ jobs:
       - name: Build ${{ inputs.contract }}
         run: cargo test-tube-build
         working-directory: smart-contracts/contracts/${{ inputs.contract }}
+      - name: Build dex-router-osmosis
+        if: ${{inputs.dex_router_osmosis}}
+        run: cargo test-tube-build
+        working-directory: smart-contracts/contracts/dex-router-osmosis
       - name: Run test-tube tests
         run: cargo test-tube
         working-directory: smart-contracts/contracts/${{ inputs.contract }}
+      - name: Clear temporary test-tube files
+        if: always()
+        run: rm -rf .osmosis-test-tube-temp-*
+        working-directory: /tmp