diff --git a/build_and_test.sh b/build_and_test.sh
index 2e6d5c856..5153fd6eb 100755
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -19,4 +19,9 @@ go vet -composites=false $FLAGS ./...
 
 go build $FLAGS -o kaspad .
 
-go test $FLAGS ./...
\ No newline at end of file
+if [ -n "${NO_PARALLEL}" ]
+then
+  go test -parallel=1 $FLAGS ./...
+else
+  go test $FLAGS ./...
+fi
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ab64a07e9..7a152738b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@ COPY go.sum .
 
 COPY . .
 
-RUN ./build_and_test.sh
+RUN NO_PARALLEL=1 ./build_and_test.sh
 
 # --- multistage docker build: stage #2: runtime image
 FROM alpine