diff --git a/.circleci/config.yml b/.circleci/config.yml
index e673ff689b..5fa670c4f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,8 +58,9 @@ jobs:
       - image: library/docker:17.10
     steps:
       - checkout
-      - setup_remote_docker
-      - run: docker build -f Dockerfile-test .
+      - setup_remote_docker:
+          version: 17.10.0-ce
+      - run: docker build -f Dockerfile .
 
   release:
     docker:
@@ -67,7 +68,8 @@ jobs:
     working_directory: /go/src/github.com/ory/oathkeeper
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 17.10.0-ce
       - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile -t oryd/oathkeeper:$CIRCLE_TAG .
       - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
       - run: docker push oryd/oathkeeper:$CIRCLE_TAG
diff --git a/Dockerfile-test b/Dockerfile-test
deleted file mode 100644
index bcb007fae9..0000000000
--- a/Dockerfile-test
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM golang:1.9-alpine
-
-RUN apk add --no-cache git build-base curl
-RUN curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $GOPATH/bin/dep
-RUN chmod +x $GOPATH/bin/dep
-
-WORKDIR /go/src/github.com/ory/oathkeeper
-
-ADD ./Gopkg.lock ./Gopkg.lock
-ADD ./Gopkg.toml ./Gopkg.toml
-RUN dep ensure -vendor-only
-
-ADD . .
-RUN go install .
-
-ENTRYPOINT /go/bin/oathkeeper
-
-EXPOSE 4456