diff --git a/.github/workflows/fendermint-test.yaml b/.github/workflows/fendermint-test.yaml
index 62b6c71d3..0ea576f14 100644
--- a/.github/workflows/fendermint-test.yaml
+++ b/.github/workflows/fendermint-test.yaml
@@ -46,8 +46,13 @@ jobs:
         make:
           - name: Clippy
             task: check-clippy
-          - name: Test
-            task: test
+          # Technically it's not necessary to build, testing would be fine on its own.
+          # However, tests bring in dev-dependencies, and without them something might not compile,
+          # which we want to catch as it would mean the `cargo build` in the docs would fail.
+          # Doing it a one step so build artifacts can be reused by the tests, minimising the overhead.
+          - name: Build and Test
+            task: build test
+          # Tests that involve docker.
           - name: End-to-End
             task: e2e
         exclude:
@@ -97,4 +102,4 @@ jobs:
       - name: ${{ matrix.make.name }}
         env:
           PROMTAIL_CLIENT_URL: ${{ secrets.PROMTAIL_CLIENT_URL }}
-        run: cd fendermint && make ${{ matrix.make.task }}
\ No newline at end of file
+        run: cd fendermint && make ${{ matrix.make.task }}
diff --git a/fendermint/Makefile b/fendermint/Makefile
index 2c0c6db8c..e6d27f103 100644
--- a/fendermint/Makefile
+++ b/fendermint/Makefile
@@ -26,7 +26,7 @@ BUILDX_FLAGS ?=
 # Set to the `<repo>/<image>:<tag>` label the image.
 BUILDX_TAG   ?= fendermint:latest
 
-all: test build diagrams
+all: lint build test diagrams docker-build
 
 diagrams:
 	make -C  ../docs/fendermint/diagrams diagrams
diff --git a/fendermint/testing/materializer/Cargo.toml b/fendermint/testing/materializer/Cargo.toml
index aa89ff08e..cf6e7ff97 100644
--- a/fendermint/testing/materializer/Cargo.toml
+++ b/fendermint/testing/materializer/Cargo.toml
@@ -16,6 +16,7 @@ bollard = { workspace = true }
 ethers = { workspace = true }
 fvm_shared = { workspace = true }
 hex = { workspace = true }
+lazy_static = { workspace = true }
 multihash = { workspace = true }
 serde = { workspace = true }
 serde_with = { workspace = true }
@@ -25,7 +26,6 @@ tendermint-rpc = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 
-lazy_static = { workspace = true, optional = true }
 arbitrary = { workspace = true, optional = true }
 quickcheck = { workspace = true, optional = true }
 
@@ -60,7 +60,6 @@ default = []
 arb = [
   "arbitrary",
   "quickcheck",
-  "lazy_static",
   "fvm_shared/arb",
   "fendermint_testing/arb",
   "fendermint_vm_genesis/arb",