diff --git a/docker.Makefile b/docker.Makefile
index 88167f1c44..fc86fdc769 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -87,4 +87,4 @@ yamldocs: build_docker_image
 
 .PHONY: shellcheck
 shellcheck: build_shell_validate_image
-	docker run -ti --rm -v "$(CURDIR)":/tmp $(VALIDATE_IMAGE_NAME) make shellcheck
+	docker run -ti --rm $(MOUNTS) $(VALIDATE_IMAGE_NAME) make shellcheck
diff --git a/dockerfiles/Dockerfile.shellcheck b/dockerfiles/Dockerfile.shellcheck
index 52005939ea..12f665f7a7 100644
--- a/dockerfiles/Dockerfile.shellcheck
+++ b/dockerfiles/Dockerfile.shellcheck
@@ -4,6 +4,6 @@ RUN apt-get update && \
     apt-get -y install make shellcheck && \
     apt-get clean
 
-WORKDIR /tmp
+WORKDIR /go/src/github.com/docker/cli
 
 CMD bash