diff --git a/gateway/Dockerfile.build b/gateway/Dockerfile.build
index 3a4bc187..7e719e23 100644
--- a/gateway/Dockerfile.build
+++ b/gateway/Dockerfile.build
@@ -18,4 +18,5 @@ COPY requests   requests
 COPY tests      tests
 COPY server.go  .
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
+RUN go test -v ./tests && \
+    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
diff --git a/gateway/Dockerfile.build.armhf b/gateway/Dockerfile.build.armhf
index 6d593d05..748cff21 100644
--- a/gateway/Dockerfile.build.armhf
+++ b/gateway/Dockerfile.build.armhf
@@ -17,4 +17,5 @@ COPY handlers	handlers
 
 COPY server.go	.
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
+RUN go test -v ./tests && \
+    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .