diff --git a/Dockerfile b/Dockerfile
index 9cf9267..2f77fc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM golang
+FROM golang:1.9.4
 
 RUN go get -u github.com/golang/dep/cmd/dep
 
-COPY Gopkg.toml Gopkg.lock /go/src/github.com/heroku/herald/
 WORKDIR /go/src/github.com/heroku/herald/
+COPY Gopkg.toml Gopkg.lock ./
 RUN dep ensure --vendor-only
 
-COPY ./ /go/src/github.com/heroku/herald/
+COPY ./ ./
 
 RUN go build
 
diff --git a/Makefile b/Makefile
index 330c894..c95ef82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test:
-	go run cmd/herald-test/main.go
+	go test
 run:
 	go run cmd/version-scraper/main.go