diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index be7ad26ab6..0d4a1ab1a7 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1516,6 +1516,7 @@ tasks:
       - func: run-atlas-data-lake-test
 
   - name: test-docker-runner
+    tags: ["pullrequest"]
     commands:
       - func: run-docker-test
 
diff --git a/Dockerfile b/Dockerfile
index 446ab1d5f2..c96c694b87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,16 +20,26 @@ RUN cd /root && bash ./install-libmongocrypt.sh
 # from the libmongocrypt build stage.
 FROM drivers-evergreen-tools
 
+# Install common deps.
 RUN export DEBIAN_FRONTEND=noninteractive && \
   export TZ=Etc/UTC && \
   apt-get -qq update && \
-  apt-get -qqy install --no-install-recommends \
-    pkg-config \
+  apt-get -qqy install --reinstall --no-install-recommends \
     tzdata \
+    ca-certificates \
+    pkg-config \
+    software-properties-common \
     gpg \
     apt-utils \
     make && \
-  apt-add-repository ppa:longsleep/golang-backports && \
+  sudo update-ca-certificates && \
+  rm -rf /var/lib/apt/lists/*
+
+# Install golang from the golang-backports ppa.
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  export TZ=Etc/UTC && \
+  export LC_ALL=C.UTF-8 && \
+  sudo -E apt-add-repository "ppa:longsleep/golang-backports" && \
   apt-get -qq update && \
   apt-get -qqy install --no-install-recommends golang-go && \
   rm -rf /var/lib/apt/lists/*
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index f0c0d0d89d..c24f9469be 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -116,7 +116,7 @@ There is currently no arm64 support for the go1.x runtime, see [here](https://do
 
 ### Testing in Docker
 
-We support local testing in Docker. Ensure ``docker`` is installed and running, and then run:
+We support local testing in Docker.  To test using docker, you will need to set the `DRIVERS_TOOLs` environment variable to point to a local clone of the drivers-evergreen-tools repository. This is essential for running the testing matrix in a container. You can set the `DRIVERS_TOOLS` variable in your shell profile or in your project-specific environment.
 
 ```bash
 bash etc/run_docker.sh