diff --git a/_dev/bogo/Dockerfile b/_dev/bogo/Dockerfile
index 1c9ecf1..465f3d9 100644
--- a/_dev/bogo/Dockerfile
+++ b/_dev/bogo/Dockerfile
@@ -8,6 +8,14 @@ RUN apk add --update \
 
 ENV CGO_ENABLED=0
 
-RUN go get -d github.com/FiloSottile/crypto-tls-bogo-shim
+RUN git clone https://github.com/FiloSottile/crypto-tls-bogo-shim \
+    /go/src/github.com/FiloSottile/crypto-tls-bogo-shim
+
+# Draft 18 with client-tests branch
+ARG REVISION=3f5e87d6a1931b6f6930e4eadb7b2d0b2aa7c588
+
+RUN cd /go/src/github.com/FiloSottile/crypto-tls-bogo-shim && \
+    git checkout $REVISION
+
 WORKDIR /go/src/github.com/FiloSottile/crypto-tls-bogo-shim
 CMD ["make", "run"]