diff --git a/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml b/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml
index dc664ab76b..7d1375793e 100644
--- a/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml
+++ b/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml
@@ -3,8 +3,10 @@ description: "retryable-writes bulkWrite serverErrors"
 schemaVersion: "1.0"
 
 runOnRequirements:
-  - minServerVersion: "3.6"
+  - minServerVersion: "4.0"
     topologies: [ replicaset ]
+  - minServerVersion: "4.1.7"
+    topologies: [ sharded ]
 
 createEntities:
   - client:
@@ -29,11 +31,6 @@ initialData:
 
 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
         object: testRunner
diff --git a/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml b/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml
index 689328818b..231569fb0d 100644
--- a/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml
+++ b/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml
@@ -3,8 +3,10 @@ description: "retryable-writes insertOne serverErrors"
 schemaVersion: "1.0"
 
 runOnRequirements:
-  - minServerVersion: "3.6"
+  - minServerVersion: "4.0"
     topologies: [ replicaset ]
+  - minServerVersion: "4.1.7"
+    topologies: [ sharded ]
 
 createEntities:
   - client:
@@ -29,11 +31,6 @@ initialData:
 
 tests:
   - description: "InsertOne succeeds after retryable writeConcernError"
-    runOnRequirements:
-      - minServerVersion: "4.0"
-        topologies: [ replicaset ]
-      - minServerVersion: "4.1.7"
-        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-crud.yml b/spec/spec_tests/data/unified/valid-pass/poc-crud.yml
index b7d05d75af..5748c0779f 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-crud.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-crud.yml
@@ -143,7 +143,7 @@ tests:
   - description: "readConcern majority with out stage"
     runOnRequirements:
       - minServerVersion: "4.1.0"
-        topologies: [ replicaset, sharded-replicaset ]
+        topologies: [ replicaset, sharded ]
         serverless: "forbid"
     operations:
       - name: aggregate
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml b/spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml
index fa882e2836..258043764a 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml
@@ -2,10 +2,6 @@ description: "poc-retryable-writes"
 
 schemaVersion: "1.0"
 
-runOnRequirements:
-  - minServerVersion: "3.6"
-    topologies: [ replicaset ]
-
 createEntities:
   - client:
       id: &client0 client0
@@ -42,6 +38,9 @@ initialData:
 
 tests:
   - description: "FindOneAndUpdate is committed on first attempt"
+    runOnRequirements: &onPrimaryTransactionalWrite_requirements
+      - minServerVersion: "3.6"
+        topologies: [ replicaset ]
     operations:
       - name: failPoint
         object: testRunner
@@ -65,6 +64,7 @@ tests:
           - { _id: 2, x: 22 }
 
   - description: "FindOneAndUpdate is not committed on first attempt"
+    runOnRequirements: *onPrimaryTransactionalWrite_requirements
     operations:
       - name: failPoint
         object: testRunner
@@ -89,6 +89,7 @@ tests:
           - { _id: 2, x: 22 }
 
   - description: "FindOneAndUpdate is never committed"
+    runOnRequirements: *onPrimaryTransactionalWrite_requirements
     operations:
       - name: failPoint
         object: testRunner
@@ -117,9 +118,7 @@ tests:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.7"
-        # Original test uses "sharded", but retryable writes requires a sharded
-        # cluster backed by replica sets
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner
@@ -192,6 +191,7 @@ tests:
             mode: { times: 2 }
             data:
               failCommands: [ insert ]
+              errorLabels: [ RetryableWriteError ]
               writeConcernError:
                 code: 91 # ShutdownInProgress
                 errmsg: "Replication is being shut down"
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-sessions.yml b/spec/spec_tests/data/unified/valid-pass/poc-sessions.yml
index e770f7fc6d..a93096a222 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-sessions.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-sessions.yml
@@ -125,12 +125,11 @@ tests:
   - description: "Dirty explicit session is discarded"
     skipReason: RUBY-1813
     # Original test specified retryWrites=true, but that is now the default.
-    # Retryable writes will require a sharded-replicaset, though.
     runOnRequirements:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.8"
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner
@@ -181,7 +180,7 @@ tests:
           - commandStartedEvent: &insert_attempt
               command:
                 insert: *collection0Name
-                documents: 
+                documents:
                   - { _id: 2 }
                 ordered: true
                 lsid: { $$sessionLsid: *session0 }
@@ -192,7 +191,7 @@ tests:
           - commandStartedEvent:
               command:
                 insert: *collection0Name
-                documents: 
+                documents:
                   - { _id: 3 }
                 ordered: true
                 lsid: { $$sessionLsid: *session0 }
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml b/spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml
index 4f981d15dd..94fadda0aa 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml
@@ -6,7 +6,7 @@ runOnRequirements:
   - minServerVersion: "4.0"
     topologies: [ replicaset ]
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml b/spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml
index 47db7c3188..33cd2a2521 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml
@@ -4,7 +4,7 @@ schemaVersion: "1.0"
 
 runOnRequirements:
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:
diff --git a/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml b/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml
index 0a66b9bd7f..8a12c8b39a 100644
--- a/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml
+++ b/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml
@@ -6,7 +6,7 @@ runOnRequirements:
   - minServerVersion: "4.0"
     topologies: [ replicaset ]
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:
@@ -51,7 +51,7 @@ tests:
   - description: "explicitly create collection using create command"
     runOnRequirements:
       - minServerVersion: "4.3.4"
-        topologies: [ replicaset, sharded-replicaset ]
+        topologies: [ replicaset, sharded ]
     operations:
       - name: dropCollection
         object: *database0
@@ -109,7 +109,7 @@ tests:
   - description: "create index on a non-existing collection"
     runOnRequirements:
       - minServerVersion: "4.3.4"
-        topologies: [ replicaset, sharded-replicaset ]
+        topologies: [ replicaset, sharded ]
     operations:
       - name: dropCollection
         object: *database0