diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index a4723bb45..28c85b44e 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -19,15 +19,19 @@ RUN apk add --no-cache --initdb -p /out \
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime
 
-FROM scratch
-COPY --from=mirror /out/ /
-ENV GOPATH=/go
+RUN apk add git
+ENV GOPATH=/out/go
 RUN mkdir -p $GOPATH/src/github.com/containerd && \
   cd $GOPATH/src/github.com/containerd && \
   git clone https://github.com/containerd/containerd.git
 WORKDIR $GOPATH/src/github.com/containerd/containerd
 # CONTAINERD_COMMIT is defined in linuxkit/alpine
 RUN git checkout $CONTAINERD_COMMIT
+
+FROM scratch
+COPY --from=mirror /out/ /
+ENV GOPATH=/go
+WORKDIR $GOPATH/src/github.com/containerd/containerd
 ADD run.sh ./run.sh
 
 ENTRYPOINT ["/bin/sh", "run.sh"]