diff --git a/.travis.yml b/.travis.yml
index e1dd2d04..48a0bbe3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ addons:
       - docker-ce
 
 before_install:
-    - docker pull golang:1.7.5
 
 script:
     - sh build.sh
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index fa17d588..a6241dd4 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7.5 as build
+FROM golang:1.8.3 as build
 WORKDIR /go/src/github.com/openfaas/faas/gateway
 
 COPY vendor         vendor
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index 6e47e884..1a7b52c9 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -11,9 +11,9 @@ COPY requesthandler_test.go .
 COPY types types
 
 # Run a gofmt and exclude all vendored code.
-RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
+RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
 
-RUN go test
+RUN go test -v ./...
 
 # Stripping via -ldflags "-s -w" 
 RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o watchdog . \