diff --git a/scripts/docker/build-and-test.sh b/scripts/docker/build.sh
similarity index 86%
rename from scripts/docker/build-and-test.sh
rename to scripts/docker/build.sh
index 6bdc1e0..525de28 100755
--- a/scripts/docker/build-and-test.sh
+++ b/scripts/docker/build.sh
@@ -13,7 +13,6 @@ docker run --rm \
     dotnet --info
     dotnet restore DynamORM.sln
     dotnet build DynamORM.sln -c Release --no-restore
-    dotnet test DynamORM.Tests/DynamORM.Tests.csproj -c Release --no-build
     dotnet pack DynamORM/DynamORM.csproj -c Release --no-build -o /workspace/artifacts/nuget
   "
 
diff --git a/scripts/docker/ci-local.sh b/scripts/docker/ci-local.sh
index 1ddf7e0..1e04680 100755
--- a/scripts/docker/ci-local.sh
+++ b/scripts/docker/ci-local.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 
 "${ROOT_DIR}/scripts/docker/generate-amalgamation.sh"
-"${ROOT_DIR}/scripts/docker/build-and-test.sh"
+"${ROOT_DIR}/scripts/docker/build.sh"
+"${ROOT_DIR}/scripts/docker/test.sh"
 "${ROOT_DIR}/scripts/docker/mono-net40-smoke.sh"
 
 echo "All docker checks completed."
-
diff --git a/scripts/docker/test.sh b/scripts/docker/test.sh
new file mode 100755
index 0000000..d7b8b8c
--- /dev/null
+++ b/scripts/docker/test.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+IMAGE="${DOTNET_IMAGE:-mcr.microsoft.com/dotnet/sdk:10.0}"
+
+docker run --rm \
+  -v "${ROOT_DIR}:/workspace" \
+  -w /workspace \
+  "${IMAGE}" \
+  bash -lc "
+    set -euo pipefail
+    dotnet test DynamORM.Tests/DynamORM.Tests.csproj -c Release
+  "
+