diff --git a/Makefile b/Makefile
index 732bd5af9..71ff1ee18 100644
--- a/Makefile
+++ b/Makefile
@@ -486,12 +486,12 @@ build-functional:
 build-docker-functional:
 	$(info GO_VERSION: $(GO_VERSION))
 	$(info ETCD_VERSION: $(ETCD_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-functional
+	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./functional/Dockerfile
 	docker build \
 	  --tag gcr.io/etcd-development/etcd-functional:go$(GO_VERSION) \
-	  --file ./Dockerfile-functional \
+	  --file ./functional/Dockerfile \
 	  .
-	@mv ./Dockerfile-functional.bak ./Dockerfile-functional
+	@mv ./functional/Dockerfile.bak ./functional/Dockerfile
 
 	docker run \
 	  --rm \
diff --git a/Dockerfile-functional b/functional/Dockerfile
similarity index 94%
rename from Dockerfile-functional
rename to functional/Dockerfile
index fbcc34ec2..5e6a32bd9 100644
--- a/Dockerfile-functional
+++ b/functional/Dockerfile
@@ -13,7 +13,7 @@ RUN dnf check-update || true \
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
-ENV GO_VERSION REPLACE_ME_GO_VERSION
+ENV GO_VERSION 1.10.1
 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
 RUN rm -rf ${GOROOT} \
   && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \