diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 6780bf230da..8e5428d3cde 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1653,7 +1653,7 @@ tasks:
       - func: run bson-ext test
         vars:
           NODE_LTS_NAME: erbium
-  - name: run-custom-csfle-tests
+  - name: run-custom-csfle-tests-pinned-commit
     tags:
       - run-custom-dependency-tests
     commands:
@@ -1666,6 +1666,23 @@ tasks:
           TOPOLOGY: replica_set
       - func: bootstrap kms servers
       - func: run custom csfle tests
+        vars:
+          CSFLE_GIT_REF: c2712248e9f4909cdad723607ea5291d2eb48b91
+  - name: run-custom-csfle-tests-master
+    tags:
+      - run-custom-dependency-tests
+    commands:
+      - func: install dependencies
+        vars:
+          NODE_LTS_NAME: erbium
+      - func: bootstrap mongo-orchestration
+        vars:
+          VERSION: latest
+          TOPOLOGY: replica_set
+      - func: bootstrap kms servers
+      - func: run custom csfle tests
+        vars:
+          CSFLE_GIT_REF: master
   - name: test-latest-server-noauth
     tags:
       - latest
@@ -2226,7 +2243,8 @@ buildvariants:
     tasks:
       - run-custom-snappy-tests
       - run-bson-ext-test
-      - run-custom-csfle-tests
+      - run-custom-csfle-tests-pinned-commit
+      - run-custom-csfle-tests-master
   - name: ubuntu1804-test-serverless
     display_name: Serverless Test
     run_on: ubuntu1804-test
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
index fd92b462df3..2a88dd605dd 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -537,7 +537,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
 }));
 
 oneOffFuncAsTasks.push({
-  name: 'run-custom-csfle-tests',
+  name: 'run-custom-csfle-tests-pinned-commit',
   tags: ['run-custom-dependency-tests'],
   commands: [
     {
@@ -554,7 +554,39 @@ oneOffFuncAsTasks.push({
       }
     },
     { func: 'bootstrap kms servers' },
-    { func: 'run custom csfle tests' }
+    {
+      func: 'run custom csfle tests',
+      vars: {
+        CSFLE_GIT_REF: 'c2712248e9f4909cdad723607ea5291d2eb48b91'
+      }
+    }
+  ]
+});
+
+oneOffFuncAsTasks.push({
+  name: 'run-custom-csfle-tests-master',
+  tags: ['run-custom-dependency-tests'],
+  commands: [
+    {
+      func: 'install dependencies',
+      vars: {
+        NODE_LTS_NAME: LOWEST_LTS
+      }
+    },
+    {
+      func: 'bootstrap mongo-orchestration',
+      vars: {
+        VERSION: 'latest',
+        TOPOLOGY: 'replica_set'
+      }
+    },
+    { func: 'bootstrap kms servers' },
+    {
+      func: 'run custom csfle tests',
+      vars: {
+        CSFLE_GIT_REF: 'master'
+      }
+    }
   ]
 });
 
diff --git a/.evergreen/run-custom-csfle-tests.sh b/.evergreen/run-custom-csfle-tests.sh
index 7434afa5fce..59bed7e6ff8 100644
--- a/.evergreen/run-custom-csfle-tests.sh
+++ b/.evergreen/run-custom-csfle-tests.sh
@@ -26,8 +26,7 @@ ABS_PATH_TO_PATCH=$(pwd)
 # Environment Variables:
 # CSFLE_GIT_REF - set the git reference to checkout for a custom CSFLE version
 # CDRIVER_GIT_REF - set the git reference to checkout for a custom CDRIVER version (this is for libbson)
-
-CSFLE_GIT_REF=${CSFLE_GIT_REF:-c2712248e9f4909cdad723607ea5291d2eb48b91}
+CSFLE_GIT_REF=${CSFLE_GIT_REF:-master}
 CDRIVER_GIT_REF=${CDRIVER_GIT_REF:-1.17.6}
 
 rm -rf ../csfle-deps-tmp