diff --git a/Dockerfile b/Dockerfile
index a30b3538a..bea06624c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     git \
     protobuf-compiler \
     libprotobuf-dev
-RUN go get github.com/golang/protobuf/protoc-gen-go
+RUN go get github.com/golang/protobuf/protoc-gen-go && \
+    go get gotest.tools/gotestsum
 WORKDIR ${PWD}
 ADD go.* ${PWD}
 RUN go mod download
@@ -25,6 +26,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     GOARCH=${TARGET_ARCH} \
     make bins
 
+FROM make-protos as make-test
+RUN make test
+
 FROM make-protos AS make-xbins
 RUN --mount=type=cache,target=/root/.cache/go-build \
     make xbins
diff --git a/Makefile b/Makefile
index 4a693bc7a..7286a142b 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,10 @@ dxbins: dbins
 	--output type=local,dest=./bin \
 	--target xbins
 
+dtest:
+	docker build . \
+	--target make-test
+
 test:
 	gotestsum ./...