diff --git a/tests/UnifiedSpecTests/retryable-writes/bulkWrite-serverErrors.json b/tests/UnifiedSpecTests/retryable-writes/bulkWrite-serverErrors.json
index aed210ec2..835dab787 100644
--- a/tests/UnifiedSpecTests/retryable-writes/bulkWrite-serverErrors.json
+++ b/tests/UnifiedSpecTests/retryable-writes/bulkWrite-serverErrors.json
@@ -3,10 +3,16 @@
   "schemaVersion": "1.0",
   "runOnRequirements": [
     {
-      "minServerVersion": "3.6",
+      "minServerVersion": "4.0",
       "topologies": [
         "replicaset"
       ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topologies": [
+        "sharded"
+      ]
     }
   ],
   "createEntities": [
@@ -53,20 +59,6 @@
   "tests": [
     {
       "description": "BulkWrite succeeds after retryable writeConcernError in first batch",
-      "runOnRequirements": [
-        {
-          "minServerVersion": "4.0",
-          "topologies": [
-            "replicaset"
-          ]
-        },
-        {
-          "minServerVersion": "4.1.7",
-          "topologies": [
-            "sharded"
-          ]
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/tests/UnifiedSpecTests/retryable-writes/insertOne-serverErrors.json b/tests/UnifiedSpecTests/retryable-writes/insertOne-serverErrors.json
index a87f45169..aef30fda2 100644
--- a/tests/UnifiedSpecTests/retryable-writes/insertOne-serverErrors.json
+++ b/tests/UnifiedSpecTests/retryable-writes/insertOne-serverErrors.json
@@ -3,10 +3,16 @@
   "schemaVersion": "1.0",
   "runOnRequirements": [
     {
-      "minServerVersion": "3.6",
+      "minServerVersion": "4.0",
       "topologies": [
         "replicaset"
       ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topologies": [
+        "sharded"
+      ]
     }
   ],
   "createEntities": [
@@ -53,20 +59,6 @@
   "tests": [
     {
       "description": "InsertOne succeeds after retryable writeConcernError",
-      "runOnRequirements": [
-        {
-          "minServerVersion": "4.0",
-          "topologies": [
-            "replicaset"
-          ]
-        },
-        {
-          "minServerVersion": "4.1.7",
-          "topologies": [
-            "sharded"
-          ]
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/tests/UnifiedSpecTests/valid-pass/poc-retryable-writes.json b/tests/UnifiedSpecTests/valid-pass/poc-retryable-writes.json
index da72b7f27..f9aa164bc 100644
--- a/tests/UnifiedSpecTests/valid-pass/poc-retryable-writes.json
+++ b/tests/UnifiedSpecTests/valid-pass/poc-retryable-writes.json
@@ -1,14 +1,6 @@
 {
   "description": "poc-retryable-writes",
   "schemaVersion": "1.0",
-  "runOnRequirements": [
-    {
-      "minServerVersion": "3.6",
-      "topologies": [
-        "replicaset"
-      ]
-    }
-  ],
   "createEntities": [
     {
       "client": {
@@ -79,6 +71,14 @@
   "tests": [
     {
       "description": "FindOneAndUpdate is committed on first attempt",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6",
+          "topologies": [
+            "replicaset"
+          ]
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -132,6 +132,14 @@
     },
     {
       "description": "FindOneAndUpdate is not committed on first attempt",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6",
+          "topologies": [
+            "replicaset"
+          ]
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -188,6 +196,14 @@
     },
     {
       "description": "FindOneAndUpdate is never committed",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6",
+          "topologies": [
+            "replicaset"
+          ]
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -433,6 +449,9 @@
                 "failCommands": [
                   "insert"
                 ],
+                "errorLabels": [
+                  "RetryableWriteError"
+                ],
                 "writeConcernError": {
                   "code": 91,
                   "errmsg": "Replication is being shut down"