diff --git a/Dockerfile b/Dockerfile
index 7c172c3..23cf54b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,3 +47,5 @@ RUN set -x \
 COPY . /go/src/github.com/docker/containerd
 
 WORKDIR /go/src/github.com/docker/containerd
+
+RUN make all install
diff --git a/Makefile b/Makefile
index de1c359..f5d074b 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ lint:
 shell: dbuild
 	$(DOCKER_RUN) bash
 
-test: all validate
+test: validate
 	go test -v $(shell go list ./... | grep -v /vendor | grep -v /integration-test)
 ifneq ($(wildcard /.dockerenv), )
 	$(MAKE) install bundles-rootfs