diff --git a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json
index a1c761095e0..43b9ff74f29 100644
--- a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json
+++ b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json
@@ -398,6 +398,11 @@
     },
     {
       "description": "getnonce command and server reply are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -443,6 +448,11 @@
     },
     {
       "description": "network error in response to getnonce is not redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -753,6 +763,11 @@
     },
     {
       "description": "copydbgetnonce command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "3.6.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -804,7 +819,7 @@
       "description": "network error in response to copydbgetnonce is not redacted",
       "runOnRequirements": [
         {
-          "maxServerVersion": "4.0.99"
+          "maxServerVersion": "3.6.99"
         }
       ],
       "operations": [
@@ -875,6 +890,11 @@
     },
     {
       "description": "copydbsaslstart command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "4.0.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -997,6 +1017,11 @@
     },
     {
       "description": "copydb command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "4.0.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml
index 458292bbc22..05d61465e5a 100644
--- a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml
+++ b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml
@@ -241,6 +241,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "getnonce command and server reply are redacted"
+    runOnRequirements:
+      - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *database
@@ -268,6 +270,8 @@ tests:
                 $$matchAsDocument: {}
 
   - description: "network error in response to getnonce is not redacted"
+    runOnRequirements:
+      - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: failPoint
         object: testRunner
@@ -453,6 +457,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydbgetnonce command and resulting server-generated error are redacted"
+    runOnRequirements:
+      - maxServerVersion: 3.6.99 # copydbgetnonce was removed as of 4.0 via SERVER-32276
     operations:
       - name: runCommand
         object: *database
@@ -483,7 +489,7 @@ tests:
 
   - description: "network error in response to copydbgetnonce is not redacted"
     runOnRequirements:
-      - maxServerVersion: "4.0.99" # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+      - maxServerVersion: 3.6.99 # copydbgetnonce was removed as of 4.0 via SERVER-32276
     operations:
       - name: failPoint
         object: testRunner
@@ -523,6 +529,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydbsaslstart command and resulting server-generated error are redacted"
+    runOnRequirements:
+    - maxServerVersion: 4.0.99 # copydbsaslstart was removed as of 4.2 via SERVER-36211
     operations:
       - name: runCommand
         object: *database
@@ -553,7 +561,7 @@ tests:
 
   - description: "network error in response to copydbsaslstart is not redacted"
     runOnRequirements:
-    - maxServerVersion: "4.0.99"  # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+    - maxServerVersion: 4.0.99 # copydbsaslstart was removed as of 4.2 via SERVER-36211
     operations:
       - name: failPoint
         object: testRunner
@@ -593,6 +601,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydb command and resulting server-generated error are redacted"
+    runOnRequirements:
+    - maxServerVersion: 4.0.99 # copydb was removed as of 4.2 via SERVER-36257
     operations:
       - name: runCommand
         object: *database
@@ -623,7 +633,7 @@ tests:
 
   - description: "network error in response to copydb is not redacted"
     runOnRequirements:
-    - maxServerVersion: "4.0.99"  # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+    - maxServerVersion: 4.0.99 # copydb was removed as of 4.2 via SERVER-36257
     operations:
       - name: failPoint
         object: testRunner
diff --git a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json
index 0f85dc3e94a..645348591a3 100644
--- a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json
+++ b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json
@@ -162,6 +162,11 @@
     },
     {
       "description": "getnonce",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml
index 570fb5a547e..f730785d733 100644
--- a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml
+++ b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml
@@ -93,6 +93,8 @@ tests:
                 payload: { $$exists: false }
 
   - description: "getnonce"
+    runOnRequirements:
+      - maxServerVersion: "6.1.99"  
     operations:
       - name: runCommand
         object: *database
diff --git a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json
index 411ca19c5d0..d3ae5665be9 100644
--- a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json
+++ b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json
@@ -61,6 +61,11 @@
   "tests": [
     {
       "description": "getnonce is observed with observeSensitiveCommands=true",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -106,6 +111,11 @@
     },
     {
       "description": "getnonce is not observed with observeSensitiveCommands=false",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -127,6 +137,11 @@
     },
     {
       "description": "getnonce is not observed by default",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml
index 13db4137062..cd4d27a165b 100644
--- a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml
+++ b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml
@@ -38,6 +38,8 @@ createEntities:
 
 tests:
   - description: "getnonce is observed with observeSensitiveCommands=true"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseObserveSensitiveCommands
@@ -57,6 +59,8 @@ tests:
                 nonce: { $$exists: false }
 
   - description: "getnonce is not observed with observeSensitiveCommands=false"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseDoNotObserveSensitiveCommands
@@ -68,6 +72,8 @@ tests:
         events: []
 
   - description: "getnonce is not observed by default"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseDoNotObserveSensitiveCommandsByDefault