diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 17ea33cdb5..0515d27eb6 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2357,6 +2357,11 @@ axes:
         run_on: ubuntu1804-build
         variables:
           GO_DIST: "/opt/golang/go1.20"
+      - id: "ubuntu2004-go-1-20"
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-build
+        variables:
+          GO_DIST: "/opt/golang/go1.20"
       - id: "macos11-go-1-20"
         display_name: "MacOS 11.0"
         run_on: macos-1100
@@ -2716,7 +2721,7 @@ buildvariants:
       - name: ".load-balancer"
 
   - matrix_name: "serverless"
-    matrix_spec: { os-ssl-40: ["ubuntu1804-64-go-1-20"] }
+    matrix_spec: { os-ssl-40: ["ubuntu2004-go-1-20"] }
     display_name: "Serverless ${os-ssl-40}"
     tasks:
       - "serverless_task_group"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index ef14a6b3e5..66cb9f394c 100644
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -115,6 +115,6 @@ GCP_PRIVATE_KEY="${cse_gcp_private_key}" \
 CSFLE_TLS_CA_FILE="$CSFLE_TLS_CA_FILE" \
 CSFLE_TLS_CERTIFICATE_KEY_FILE="$CSFLE_TLS_CERTIFICATE_KEY_FILE" \
 CRYPT_SHARED_LIB_PATH=$CRYPT_SHARED_LIB_PATH \
-make $MAKEFILE_TARGET \
 PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
+make $MAKEFILE_TARGET