diff --git a/swarm/docker/Dockerfile b/swarm/docker/Dockerfile
index e76edf765e..f357976fb0 100644
--- a/swarm/docker/Dockerfile
+++ b/swarm/docker/Dockerfile
@@ -21,6 +21,7 @@ COPY --from=builder /go/bin/swarm-smoke /
 COPY --from=builder /go/bin/swarm-smoke-pss /
 ADD run-smoke.sh /run-smoke.sh
 ENTRYPOINT ["/run-smoke.sh"]
+CMD [ "/swarm-smoke"]
 
 FROM alpine:3.8 as swarm-global-store
 WORKDIR /
diff --git a/swarm/docker/run-smoke.sh b/swarm/docker/run-smoke.sh
index ba57a7ecd6..568e497069 100755
--- a/swarm/docker/run-smoke.sh
+++ b/swarm/docker/run-smoke.sh
@@ -4,4 +4,4 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-/swarm-smoke $@ 2>&1 || true
+$@ || true