diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8875cb83a..62b8e59ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,8 @@ env:
     CARGO_TERM_COLOR: always
 
 jobs:
-  test:
-    name: Test Suite
+  test_mpt_trie:
+    name: Test mpt_trie
     runs-on: ubuntu-latest
     timeout-minutes: 30
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
@@ -27,42 +27,97 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-02-01
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
             cache-on-failure: true
 
-      - name: Check in trace_decoder subdirectory
-        run: cargo check --manifest-path trace_decoder/Cargo.toml
+      - name: Test in mpt_trie subdirectory
+        run: cargo test --manifest-path mpt_trie/Cargo.toml
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
           RUST_LOG: 1
           CARGO_INCREMENTAL: 1
           RUST_BACKTRACE: 1
 
-      - name: Check in proof_gen subdirectory
-        run: cargo check --manifest-path proof_gen/Cargo.toml
+  test_trace_decoder:
+    name: Test trace_decoder
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-02-01
+
+      - name: Set up rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+            cache-on-failure: true
+
+      - name: Test in trace_decoder subdirectory
+        run: cargo test --manifest-path trace_decoder/Cargo.toml
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
           RUST_LOG: 1
           CARGO_INCREMENTAL: 1
           RUST_BACKTRACE: 1
 
-      - name: Check in evm_arithmetization subdirectory
-        run: cargo check --manifest-path evm_arithmetization/Cargo.toml
+  test_proof_gen:
+    name: Test proof_gen
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-02-01
+
+      - name: Set up rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+            cache-on-failure: true
+
+      - name: Test in proof_gen subdirectory
+        run: cargo test --manifest-path proof_gen/Cargo.toml
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
           RUST_LOG: 1
           CARGO_INCREMENTAL: 1
           RUST_BACKTRACE: 1
 
-      - name: Run cargo test
-        run: cargo test --workspace
+  test_evm_arithmetization:
+    name: Test evm_arithmetization
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-02-01
+
+      - name: Set up rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+            cache-on-failure: true
+
+      - name: Test in evm_arithmetization subdirectory
+        run: cargo test --manifest-path evm_arithmetization/Cargo.toml
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
           RUST_LOG: 1
diff --git a/mpt_trie/.github/workflows/ci.yml b/mpt_trie/.github/workflows/ci.yml
deleted file mode 100644
index b4a93275c..000000000
--- a/mpt_trie/.github/workflows/ci.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches:
-      - "**"
-  workflow_dispatch:
-    branches:
-      - "**"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-    CARGO_TERM_COLOR: always
-
-jobs:
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Set up rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            cache-on-failure: true
-
-      - name: Run cargo test
-        run: cargo test --workspace
-        env:
-          RUSTFLAGS: -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
-
-  lints:
-    name: Formatting and Clippy
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: rustfmt, clippy
-
-      - name: Set up rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: Run cargo fmt
-        run: cargo fmt --all --check
-
-      - name: Run cargo clippy
-        run: cargo clippy --all-features --all-targets -- -D warnings -A incomplete-features