diff --git a/source/retryable-reads/tests/etc/templates/handshakeError.yml.template b/source/retryable-reads/tests/etc/templates/handshakeError.yml.template
index 5be7265358..f759e42df8 100644
--- a/source/retryable-reads/tests/etc/templates/handshakeError.yml.template
+++ b/source/retryable-reads/tests/etc/templates/handshakeError.yml.template
@@ -2,7 +2,8 @@
 
 description: "retryable reads handshake failures"
 
-schemaVersion: "1.3"
+# 1.4 is required for "serverless: forbid".
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.2"
@@ -52,7 +53,12 @@ tests:
   #   - Triggers failpoint (second time).
   #   - Tests whether operation successfully retries the handshake and succeeds.
 {% for operation in operations %}
-  - description: "{{operation.operation_name}} succeeds after retryable handshake network error"
+  - description: "{{operation.object}}.{{operation.operation_name}} succeeds after retryable handshake network error"
+    {%- if ((operation.operation_name == 'createChangeStream') or
+            (operation.operation_name == 'aggregate' and operation.object == 'database')) %}
+    runOnRequirements:
+      - serverless: forbid
+    {%- endif %}
     operations:
       - name: failPoint
         object: testRunner
@@ -99,7 +105,12 @@ tests:
           - commandSucceededEvent:
               commandName: {{operation.command_name}}
 
-  - description: "{{operation.operation_name}} succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "{{operation.object}}.{{operation.operation_name}} succeeds after retryable handshake server error (ShutdownInProgress)"
+    {%- if ((operation.operation_name == 'createChangeStream') or
+            (operation.operation_name == 'aggregate' and operation.object == 'database')) %}
+    runOnRequirements:
+      - serverless: forbid
+    {%- endif %}
     operations:
       - name: failPoint
         object: testRunner
diff --git a/source/retryable-reads/tests/unified/handshakeError.json b/source/retryable-reads/tests/unified/handshakeError.json
index 58bbce66a8..2921d8a954 100644
--- a/source/retryable-reads/tests/unified/handshakeError.json
+++ b/source/retryable-reads/tests/unified/handshakeError.json
@@ -1,6 +1,6 @@
 {
   "description": "retryable reads handshake failures",
-  "schemaVersion": "1.3",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.2",
@@ -62,7 +62,7 @@
   ],
   "tests": [
     {
-      "description": "listDatabases succeeds after retryable handshake network error",
+      "description": "client.listDatabases succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -155,7 +155,7 @@
       ]
     },
     {
-      "description": "listDatabases succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "client.listDatabases succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -248,7 +248,7 @@
       ]
     },
     {
-      "description": "listDatabaseNames succeeds after retryable handshake network error",
+      "description": "client.listDatabaseNames succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -338,7 +338,7 @@
       ]
     },
     {
-      "description": "listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "client.listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -428,7 +428,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake network error",
+      "description": "client.createChangeStream succeeds after retryable handshake network error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -522,7 +527,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -616,7 +626,12 @@
       ]
     },
     {
-      "description": "aggregate succeeds after retryable handshake network error",
+      "description": "database.aggregate succeeds after retryable handshake network error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -716,7 +731,12 @@
       ]
     },
     {
-      "description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -816,7 +836,7 @@
       ]
     },
     {
-      "description": "listCollections succeeds after retryable handshake network error",
+      "description": "database.listCollections succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -909,7 +929,7 @@
       ]
     },
     {
-      "description": "listCollections succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "database.listCollections succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1002,7 +1022,7 @@
       ]
     },
     {
-      "description": "listCollectionNames succeeds after retryable handshake network error",
+      "description": "database.listCollectionNames succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1095,7 +1115,7 @@
       ]
     },
     {
-      "description": "listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "database.listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1188,7 +1208,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake network error",
+      "description": "database.createChangeStream succeeds after retryable handshake network error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -1282,7 +1307,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -1376,7 +1406,7 @@
       ]
     },
     {
-      "description": "aggregate succeeds after retryable handshake network error",
+      "description": "collection.aggregate succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1469,7 +1499,7 @@
       ]
     },
     {
-      "description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1562,7 +1592,7 @@
       ]
     },
     {
-      "description": "countDocuments succeeds after retryable handshake network error",
+      "description": "collection.countDocuments succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1655,7 +1685,7 @@
       ]
     },
     {
-      "description": "countDocuments succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.countDocuments succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1748,7 +1778,7 @@
       ]
     },
     {
-      "description": "estimatedDocumentCount succeeds after retryable handshake network error",
+      "description": "collection.estimatedDocumentCount succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1838,7 +1868,7 @@
       ]
     },
     {
-      "description": "estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1928,7 +1958,7 @@
       ]
     },
     {
-      "description": "distinct succeeds after retryable handshake network error",
+      "description": "collection.distinct succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -2022,7 +2052,7 @@
       ]
     },
     {
-      "description": "distinct succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.distinct succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -2116,7 +2146,7 @@
       ]
     },
     {
-      "description": "find succeeds after retryable handshake network error",
+      "description": "collection.find succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -2209,7 +2239,7 @@
       ]
     },
     {
-      "description": "find succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.find succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -2302,7 +2332,7 @@
       ]
     },
     {
-      "description": "findOne succeeds after retryable handshake network error",
+      "description": "collection.findOne succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -2395,7 +2425,7 @@
       ]
     },
     {
-      "description": "findOne succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.findOne succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -2488,7 +2518,7 @@
       ]
     },
     {
-      "description": "listIndexes succeeds after retryable handshake network error",
+      "description": "collection.listIndexes succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -2578,7 +2608,7 @@
       ]
     },
     {
-      "description": "listIndexes succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.listIndexes succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -2668,7 +2698,7 @@
       ]
     },
     {
-      "description": "listIndexNames succeeds after retryable handshake network error",
+      "description": "collection.listIndexNames succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -2758,7 +2788,7 @@
       ]
     },
     {
-      "description": "listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -2848,7 +2878,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake network error",
+      "description": "collection.createChangeStream succeeds after retryable handshake network error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -2942,7 +2977,12 @@
       ]
     },
     {
-      "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/source/retryable-reads/tests/unified/handshakeError.yml b/source/retryable-reads/tests/unified/handshakeError.yml
index 71136f6dfb..f2b1ec982c 100644
--- a/source/retryable-reads/tests/unified/handshakeError.yml
+++ b/source/retryable-reads/tests/unified/handshakeError.yml
@@ -2,7 +2,8 @@
 
 description: "retryable reads handshake failures"
 
-schemaVersion: "1.3"
+# 1.4 is required for "serverless: forbid".
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.2"
@@ -52,7 +53,7 @@ tests:
   #   - Triggers failpoint (second time).
   #   - Tests whether operation successfully retries the handshake and succeeds.
 
-  - description: "listDatabases succeeds after retryable handshake network error"
+  - description: "client.listDatabases succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -92,7 +93,7 @@ tests:
           - commandSucceededEvent:
               commandName: listDatabases
 
-  - description: "listDatabases succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "client.listDatabases succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -132,7 +133,7 @@ tests:
           - commandSucceededEvent:
               commandName: listDatabases
 
-  - description: "listDatabaseNames succeeds after retryable handshake network error"
+  - description: "client.listDatabaseNames succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -170,7 +171,7 @@ tests:
           - commandSucceededEvent:
               commandName: listDatabases
 
-  - description: "listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "client.listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -208,7 +209,9 @@ tests:
           - commandSucceededEvent:
               commandName: listDatabases
 
-  - description: "createChangeStream succeeds after retryable handshake network error"
+  - description: "client.createChangeStream succeeds after retryable handshake network error"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -249,7 +252,9 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -290,7 +295,9 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "aggregate succeeds after retryable handshake network error"
+  - description: "database.aggregate succeeds after retryable handshake network error"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -330,7 +337,9 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "aggregate succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -370,7 +379,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "listCollections succeeds after retryable handshake network error"
+  - description: "database.listCollections succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -410,7 +419,7 @@ tests:
           - commandSucceededEvent:
               commandName: listCollections
 
-  - description: "listCollections succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "database.listCollections succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -450,7 +459,7 @@ tests:
           - commandSucceededEvent:
               commandName: listCollections
 
-  - description: "listCollectionNames succeeds after retryable handshake network error"
+  - description: "database.listCollectionNames succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -490,7 +499,7 @@ tests:
           - commandSucceededEvent:
               commandName: listCollections
 
-  - description: "listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "database.listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -530,7 +539,9 @@ tests:
           - commandSucceededEvent:
               commandName: listCollections
 
-  - description: "createChangeStream succeeds after retryable handshake network error"
+  - description: "database.createChangeStream succeeds after retryable handshake network error"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -571,7 +582,9 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -612,7 +625,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "aggregate succeeds after retryable handshake network error"
+  - description: "collection.aggregate succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -652,7 +665,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "aggregate succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.aggregate succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -692,7 +705,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "countDocuments succeeds after retryable handshake network error"
+  - description: "collection.countDocuments succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -732,7 +745,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "countDocuments succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.countDocuments succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -772,7 +785,7 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "estimatedDocumentCount succeeds after retryable handshake network error"
+  - description: "collection.estimatedDocumentCount succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -810,7 +823,7 @@ tests:
           - commandSucceededEvent:
               commandName: count
 
-  - description: "estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -848,7 +861,7 @@ tests:
           - commandSucceededEvent:
               commandName: count
 
-  - description: "distinct succeeds after retryable handshake network error"
+  - description: "collection.distinct succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -889,7 +902,7 @@ tests:
           - commandSucceededEvent:
               commandName: distinct
 
-  - description: "distinct succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.distinct succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -930,7 +943,7 @@ tests:
           - commandSucceededEvent:
               commandName: distinct
 
-  - description: "find succeeds after retryable handshake network error"
+  - description: "collection.find succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -970,7 +983,7 @@ tests:
           - commandSucceededEvent:
               commandName: find
 
-  - description: "find succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.find succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -1010,7 +1023,7 @@ tests:
           - commandSucceededEvent:
               commandName: find
 
-  - description: "findOne succeeds after retryable handshake network error"
+  - description: "collection.findOne succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -1050,7 +1063,7 @@ tests:
           - commandSucceededEvent:
               commandName: find
 
-  - description: "findOne succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.findOne succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -1090,7 +1103,7 @@ tests:
           - commandSucceededEvent:
               commandName: find
 
-  - description: "listIndexes succeeds after retryable handshake network error"
+  - description: "collection.listIndexes succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -1128,7 +1141,7 @@ tests:
           - commandSucceededEvent:
               commandName: listIndexes
 
-  - description: "listIndexes succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.listIndexes succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -1166,7 +1179,7 @@ tests:
           - commandSucceededEvent:
               commandName: listIndexes
 
-  - description: "listIndexNames succeeds after retryable handshake network error"
+  - description: "collection.listIndexNames succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -1204,7 +1217,7 @@ tests:
           - commandSucceededEvent:
               commandName: listIndexes
 
-  - description: "listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -1242,7 +1255,9 @@ tests:
           - commandSucceededEvent:
               commandName: listIndexes
 
-  - description: "createChangeStream succeeds after retryable handshake network error"
+  - description: "collection.createChangeStream succeeds after retryable handshake network error"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -1283,7 +1298,9 @@ tests:
           - commandSucceededEvent:
               commandName: aggregate
 
-  - description: "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)"
+    runOnRequirements:
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
diff --git a/source/retryable-writes/tests/etc/templates/handshakeError.yml.template b/source/retryable-writes/tests/etc/templates/handshakeError.yml.template
index 861f8c1bf1..3974392a6f 100644
--- a/source/retryable-writes/tests/etc/templates/handshakeError.yml.template
+++ b/source/retryable-writes/tests/etc/templates/handshakeError.yml.template
@@ -50,7 +50,7 @@ tests:
   #   - Triggers failpoint (second time).
   #   - Tests whether operation successfully retries the handshake and succeeds.
 {% for operation in operations %}
-  - description: "{{operation.operation_name}} succeeds after retryable handshake network error"
+  - description: "{{operation.object}}.{{operation.operation_name}} succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -94,7 +94,7 @@ tests:
           - commandSucceededEvent:
               commandName: {{operation.command_name}}
 
-  - description: "{{operation.operation_name}} succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "{{operation.object}}.{{operation.operation_name}} succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
diff --git a/source/retryable-writes/tests/unified/handshakeError.json b/source/retryable-writes/tests/unified/handshakeError.json
index e07e5412b2..df37bd7232 100644
--- a/source/retryable-writes/tests/unified/handshakeError.json
+++ b/source/retryable-writes/tests/unified/handshakeError.json
@@ -54,7 +54,7 @@
   ],
   "tests": [
     {
-      "description": "insertOne succeeds after retryable handshake network error",
+      "description": "collection.insertOne succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -150,7 +150,7 @@
       ]
     },
     {
-      "description": "insertOne succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.insertOne succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -246,7 +246,7 @@
       ]
     },
     {
-      "description": "insertMany succeeds after retryable handshake network error",
+      "description": "collection.insertMany succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -344,7 +344,7 @@
       ]
     },
     {
-      "description": "insertMany succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.insertMany succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -442,7 +442,7 @@
       ]
     },
     {
-      "description": "deleteOne succeeds after retryable handshake network error",
+      "description": "collection.deleteOne succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -535,7 +535,7 @@
       ]
     },
     {
-      "description": "deleteOne succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.deleteOne succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -628,7 +628,7 @@
       ]
     },
     {
-      "description": "replaceOne succeeds after retryable handshake network error",
+      "description": "collection.replaceOne succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -724,7 +724,7 @@
       ]
     },
     {
-      "description": "replaceOne succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.replaceOne succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -820,7 +820,7 @@
       ]
     },
     {
-      "description": "updateOne succeeds after retryable handshake network error",
+      "description": "collection.updateOne succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -918,7 +918,7 @@
       ]
     },
     {
-      "description": "updateOne succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.updateOne succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1016,7 +1016,7 @@
       ]
     },
     {
-      "description": "findOneAndDelete succeeds after retryable handshake network error",
+      "description": "collection.findOneAndDelete succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1109,7 +1109,7 @@
       ]
     },
     {
-      "description": "findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1202,7 +1202,7 @@
       ]
     },
     {
-      "description": "findOneAndReplace succeeds after retryable handshake network error",
+      "description": "collection.findOneAndReplace succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1298,7 +1298,7 @@
       ]
     },
     {
-      "description": "findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1394,7 +1394,7 @@
       ]
     },
     {
-      "description": "findOneAndUpdate succeeds after retryable handshake network error",
+      "description": "collection.findOneAndUpdate succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1492,7 +1492,7 @@
       ]
     },
     {
-      "description": "findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
@@ -1590,7 +1590,7 @@
       ]
     },
     {
-      "description": "bulkWrite succeeds after retryable handshake network error",
+      "description": "collection.bulkWrite succeeds after retryable handshake network error",
       "operations": [
         {
           "name": "failPoint",
@@ -1692,7 +1692,7 @@
       ]
     },
     {
-      "description": "bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)",
+      "description": "collection.bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)",
       "operations": [
         {
           "name": "failPoint",
diff --git a/source/retryable-writes/tests/unified/handshakeError.yml b/source/retryable-writes/tests/unified/handshakeError.yml
index b1a0e748e3..9b2774bc77 100644
--- a/source/retryable-writes/tests/unified/handshakeError.yml
+++ b/source/retryable-writes/tests/unified/handshakeError.yml
@@ -50,7 +50,7 @@ tests:
   #   - Triggers failpoint (second time).
   #   - Tests whether operation successfully retries the handshake and succeeds.
 
-  - description: "insertOne succeeds after retryable handshake network error"
+  - description: "collection.insertOne succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -90,7 +90,7 @@ tests:
           - commandSucceededEvent:
               commandName: insert
 
-  - description: "insertOne succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.insertOne succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -130,7 +130,7 @@ tests:
           - commandSucceededEvent:
               commandName: insert
 
-  - description: "insertMany succeeds after retryable handshake network error"
+  - description: "collection.insertMany succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -171,7 +171,7 @@ tests:
           - commandSucceededEvent:
               commandName: insert
 
-  - description: "insertMany succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.insertMany succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -212,7 +212,7 @@ tests:
           - commandSucceededEvent:
               commandName: insert
 
-  - description: "deleteOne succeeds after retryable handshake network error"
+  - description: "collection.deleteOne succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -252,7 +252,7 @@ tests:
           - commandSucceededEvent:
               commandName: delete
 
-  - description: "deleteOne succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.deleteOne succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -292,7 +292,7 @@ tests:
           - commandSucceededEvent:
               commandName: delete
 
-  - description: "replaceOne succeeds after retryable handshake network error"
+  - description: "collection.replaceOne succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -333,7 +333,7 @@ tests:
           - commandSucceededEvent:
               commandName: update
 
-  - description: "replaceOne succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.replaceOne succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -374,7 +374,7 @@ tests:
           - commandSucceededEvent:
               commandName: update
 
-  - description: "updateOne succeeds after retryable handshake network error"
+  - description: "collection.updateOne succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -415,7 +415,7 @@ tests:
           - commandSucceededEvent:
               commandName: update
 
-  - description: "updateOne succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.updateOne succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -456,7 +456,7 @@ tests:
           - commandSucceededEvent:
               commandName: update
 
-  - description: "findOneAndDelete succeeds after retryable handshake network error"
+  - description: "collection.findOneAndDelete succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -496,7 +496,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -536,7 +536,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "findOneAndReplace succeeds after retryable handshake network error"
+  - description: "collection.findOneAndReplace succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -577,7 +577,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -618,7 +618,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "findOneAndUpdate succeeds after retryable handshake network error"
+  - description: "collection.findOneAndUpdate succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -659,7 +659,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner
@@ -700,7 +700,7 @@ tests:
           - commandSucceededEvent:
               commandName: findAndModify
 
-  - description: "bulkWrite succeeds after retryable handshake network error"
+  - description: "collection.bulkWrite succeeds after retryable handshake network error"
     operations:
       - name: failPoint
         object: testRunner
@@ -742,7 +742,7 @@ tests:
           - commandSucceededEvent:
               commandName: insert
 
-  - description: "bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)"
+  - description: "collection.bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)"
     operations:
       - name: failPoint
         object: testRunner