diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php
index 4e8014cc8..df700407e 100644
--- a/.evergreen/config/generate-config.php
+++ b/.evergreen/config/generate-config.php
@@ -19,7 +19,6 @@
     '5.0',
     '4.4',
     '4.2',
-    '4.0',
 ];
 
 // TODO: Change when PHP 8.4 is stable
diff --git a/.evergreen/config/generated/test-variant/libmongoc.yml b/.evergreen/config/generated/test-variant/libmongoc.yml
index 85b41e617..3d49b4d76 100644
--- a/.evergreen/config/generated/test-variant/libmongoc.yml
+++ b/.evergreen/config/generated/test-variant/libmongoc.yml
@@ -12,10 +12,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.3-libmongoc-lowest-supported"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
@@ -43,10 +43,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.3-libmongoc-next-stable"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
@@ -74,10 +74,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.3-libmongoc-latest"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
diff --git a/.evergreen/config/generated/test-variant/php-full.yml b/.evergreen/config/generated/test-variant/php-full.yml
index b922689e5..e441a2e64 100644
--- a/.evergreen/config/generated/test-variant/php-full.yml
+++ b/.evergreen/config/generated/test-variant/php-full.yml
@@ -12,10 +12,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.4"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".ocsp !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
     display_tasks:
@@ -45,10 +45,10 @@ buildvariants:
         name: "build-php-8.4"
     tasks:
       # Remember to add new major versions here as they are released
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
       - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
     display_tasks:
       - name: "test-ocsp-6.0"
@@ -91,10 +91,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.3"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".ocsp !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
     display_tasks:
@@ -124,10 +124,10 @@ buildvariants:
         name: "build-php-8.3"
     tasks:
       # Remember to add new major versions here as they are released
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
       - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
     display_tasks:
       - name: "test-ocsp-6.0"
@@ -170,10 +170,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.2"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".ocsp !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
     display_tasks:
@@ -203,10 +203,10 @@ buildvariants:
         name: "build-php-8.2"
     tasks:
       # Remember to add new major versions here as they are released
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
       - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
     display_tasks:
       - name: "test-ocsp-6.0"
@@ -249,10 +249,10 @@ buildvariants:
       - variant: "build-debian12"
         name: "build-php-8.1"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".ocsp !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
     display_tasks:
@@ -282,10 +282,10 @@ buildvariants:
         name: "build-php-8.1"
     tasks:
       # Remember to add new major versions here as they are released
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
       - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
     display_tasks:
       - name: "test-ocsp-6.0"
diff --git a/.evergreen/config/generated/test/local.yml b/.evergreen/config/generated/test/local.yml
index bf8ba6562..f726bd4be 100644
--- a/.evergreen/config/generated/test/local.yml
+++ b/.evergreen/config/generated/test/local.yml
@@ -464,61 +464,3 @@ tasks:
           TOPOLOGY: "sharded_cluster"
           MONGODB_VERSION: "4.2"
       - func: "run tests"
-  - name: "test-mongodb-4.0-standalone-noauth-nossl"
-    tags: ["standalone", "local", "4.0", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "server"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
-
-  - name: "test-mongodb-4.0-standalone-auth"
-    tags: ["standalone", "local", "4.0", "auth", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "server"
-          AUTH: "auth"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
-
-  - name: "test-mongodb-4.0-standalone-ssl"
-    tags: ["standalone", "local", "4.0", "ssl", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "server"
-          SSL: "yes"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
-        vars:
-          SSL: "yes"
-
-  - name: "test-mongodb-4.0-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "4.0", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "replica_set"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
-
-  - name: "test-mongodb-4.0-replicaset-auth"
-    tags: ["replicaset", "local", "4.0", "auth", "pr", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "replica_set"
-          AUTH: "auth"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
-
-  - name: "test-mongodb-4.0-sharded-noauth-nossl"
-    tags: ["sharded", "local", "4.0", "tag"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "sharded_cluster"
-          MONGODB_VERSION: "4.0"
-      - func: "run tests"
diff --git a/.evergreen/config/templates/test-variant/libmongoc.yml b/.evergreen/config/templates/test-variant/libmongoc.yml
index 90099c6bf..cc79c01e8 100644
--- a/.evergreen/config/templates/test-variant/libmongoc.yml
+++ b/.evergreen/config/templates/test-variant/libmongoc.yml
@@ -10,10 +10,10 @@
       - variant: "build-debian12"
         name: "build-php-%phpVersion%-libmongoc-lowest-supported"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
@@ -41,10 +41,10 @@
       - variant: "build-debian12"
         name: "build-php-%phpVersion%-libmongoc-next-stable"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
@@ -72,10 +72,10 @@
       - variant: "build-debian12"
         name: "build-php-%phpVersion%-libmongoc-latest"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
       - ".ocsp !.4.4 !.5.0 !.6.0"
     display_tasks:
diff --git a/.evergreen/config/templates/test-variant/php-full.yml b/.evergreen/config/templates/test-variant/php-full.yml
index e12cd97dc..b000e3679 100644
--- a/.evergreen/config/templates/test-variant/php-full.yml
+++ b/.evergreen/config/templates/test-variant/php-full.yml
@@ -10,10 +10,10 @@
       - variant: "build-debian12"
         name: "build-php-%phpVersion%"
     tasks:
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".standalone .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".replicaset .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".sharded .local !.4.2 !.4.4 !.5.0 !.6.0"
+      - ".loadbalanced .local !.4.2 !.4.4 !.5.0 !.6.0"
       - ".ocsp !.4.4 !.5.0 !.6.0"
       - "test-atlas-connectivity"
     display_tasks:
@@ -43,10 +43,10 @@
         name: "build-php-%phpVersion%"
     tasks:
       # Remember to add new major versions here as they are released
-      - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
-      - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".standalone .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".replicaset .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".sharded .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
+      - ".loadbalanced .local !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest"
       - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest"
     display_tasks:
       - name: "test-ocsp-6.0"
diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml
index 99cd3a210..bc1974d98 100644
--- a/.evergreen/config/test-tasks.yml
+++ b/.evergreen/config/test-tasks.yml
@@ -13,23 +13,3 @@ tasks:
       - func: "run tests"
         vars:
           TESTS: "tests/atlas.phpt"
-
-  # Test different storage engines
-  - name: "test-mongodb-4.0-standalone-inmemory"
-    tags: ["standalone", "local", "4.0", "storage-engines"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "server"
-          MONGODB_VERSION: "4.0"
-          STORAGE_ENGINE: "inmemory"
-      - func: "run tests"
-  - name: "test-mongodb-4.0-standalone-mmapv1"
-    tags: ["standalone", "local", "4.0", "storage-engines"]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          TOPOLOGY: "server"
-          MONGODB_VERSION: "4.0"
-          STORAGE_ENGINE: "mmapv1"
-      - func: "run tests"
diff --git a/tests/apm/commandFailedEvent-getServerConnectionId-001.phpt b/tests/apm/commandFailedEvent-getServerConnectionId-001.phpt
index 5084508d7..bbf1a0569 100644
--- a/tests/apm/commandFailedEvent-getServerConnectionId-001.phpt
+++ b/tests/apm/commandFailedEvent-getServerConnectionId-001.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandFailedEvent includes serverConnectionId for 4.2
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/apm/commandFailedEvent-getServerConnectionId-002.phpt b/tests/apm/commandFailedEvent-getServerConnectionId-002.phpt
deleted file mode 100644
index a966dfd19..000000000
--- a/tests/apm/commandFailedEvent-getServerConnectionId-002.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-MongoDB\Driver\Monitoring\CommandFailedEvent omits serverConnectionId for pre-4.2 server
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_live(); ?>
-<?php skip_if_server_version('>=', '4.2'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
-{
-    public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event): void
-    {
-        printf("commandStarted: %s\n", $event->getCommandName());
-        var_dump($event->getServerConnectionId());
-    }
-
-    public function commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event): void
-    {
-    }
-
-    public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void
-    {
-        printf("commandFailed: %s\n", $event->getCommandName());
-        var_dump($event->getServerConnectionId());
-    }
-}
-
-$manager = create_test_manager();
-$manager->addSubscriber(new MySubscriber);
-
-$command = new MongoDB\Driver\Command([
-    'aggregate' => COLLECTION_NAME,
-    'pipeline' => [['$unsupported' => 1]],
-]);
-
-throws(function() use ($manager, $command) {
-    $manager->executeCommand(DATABASE_NAME, $command);
-}, MongoDB\Driver\Exception\CommandException::class);
-
-?>
---EXPECTF--
-commandStarted: aggregate
-NULL
-commandFailed: aggregate
-NULL
-OK: Got MongoDB\Driver\Exception\CommandException
diff --git a/tests/apm/commandStartedEvent-getServerConnectionId-001.phpt b/tests/apm/commandStartedEvent-getServerConnectionId-001.phpt
index 7ba6b6628..4547bdaea 100644
--- a/tests/apm/commandStartedEvent-getServerConnectionId-001.phpt
+++ b/tests/apm/commandStartedEvent-getServerConnectionId-001.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandStartedEvent includes serverConnectionId for 4.
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/apm/commandStartedEvent-getServerConnectionId-002.phpt b/tests/apm/commandStartedEvent-getServerConnectionId-002.phpt
deleted file mode 100644
index 9f7936a14..000000000
--- a/tests/apm/commandStartedEvent-getServerConnectionId-002.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-MongoDB\Driver\Monitoring\CommandStartedEvent omits serverConnectionId for pre-4.2 server
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_live(); ?>
-<?php skip_if_server_version('>=', '4.2'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
-{
-    public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event): void
-    {
-        printf("commandStarted: %s\n", $event->getCommandName());
-        var_dump($event->getServerConnectionId());
-    }
-
-    public function commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event): void
-    {
-    }
-
-    public function commandFailed(MongoDB\Driver\Monitoring\CommandFailedEvent $event): void
-    {
-    }
-}
-
-$manager = create_test_manager();
-$manager->addSubscriber(new MySubscriber);
-
-$manager->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(['ping' => 1]));
-
-?>
---EXPECTF--
-commandStarted: ping
-NULL
diff --git a/tests/apm/commandSucceededEvent-getServerConnectionId-001.phpt b/tests/apm/commandSucceededEvent-getServerConnectionId-001.phpt
index e7cc1a0e8..787e9ba8e 100644
--- a/tests/apm/commandSucceededEvent-getServerConnectionId-001.phpt
+++ b/tests/apm/commandSucceededEvent-getServerConnectionId-001.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\Monitoring\CommandSucceededEvent includes serverConnectionId for
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/apm/commandSucceededEvent-getServerConnectionId-002.phpt b/tests/apm/commandSucceededEvent-getServerConnectionId-002.phpt
deleted file mode 100644
index 617077571..000000000
--- a/tests/apm/commandSucceededEvent-getServerConnectionId-002.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-MongoDB\Driver\Monitoring\CommandSucceededEvent omits serverConnectionId for pre-4.2 server
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_live(); ?>
-<?php skip_if_server_version('>=', '4.2'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
-{
-    public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event): void
-    {
-        printf("commandStarted: %s\n", $event->getCommandName());
-        var_dump($event->getServerConnectionId());
-    }
-
-    public function commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event): void
-    {
-        printf("commandSucceeded: %s\n", $event->getCommandName());
-        var_dump($event->getServerConnectionId());
-    }
-
-    public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void
-    {
-    }
-}
-
-$manager = create_test_manager();
-$manager->addSubscriber(new MySubscriber);
-
-$manager->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(['ping' => 1]));
-
-?>
---EXPECTF--
-commandStarted: ping
-NULL
-commandSucceeded: ping
-NULL
diff --git a/tests/apm/serverHeartbeatFailedEvent-001.phpt b/tests/apm/serverHeartbeatFailedEvent-001.phpt
index 81c779a88..01ff4fbdf 100644
--- a/tests/apm/serverHeartbeatFailedEvent-001.phpt
+++ b/tests/apm/serverHeartbeatFailedEvent-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_standalone(); ?>
 <?php skip_if_auth(); ?>
 --FILE--
diff --git a/tests/bulk/bulkwrite-update-003.phpt b/tests/bulk/bulkwrite-update-003.phpt
index 317366812..95e66412a 100644
--- a/tests/bulk/bulkwrite-update-003.phpt
+++ b/tests/bulk/bulkwrite-update-003.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite::update() with pipeline option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/bulk/bulkwrite-update-004.phpt b/tests/bulk/bulkwrite-update-004.phpt
index 30cfc2d02..64fb3f9fe 100644
--- a/tests/bulk/bulkwrite-update-004.phpt
+++ b/tests/bulk/bulkwrite-update-004.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite::update() with hint option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/bulk/bulkwrite-update-006.phpt b/tests/bulk/bulkwrite-update-006.phpt
index 72e218b21..053b011c8 100644
--- a/tests/bulk/bulkwrite-update-006.phpt
+++ b/tests/bulk/bulkwrite-update-006.phpt
@@ -3,7 +3,6 @@ MongoDB\Driver\BulkWrite::update() PackedArray for update pipeline
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/bulk/bulkwrite-update_error-008.phpt b/tests/bulk/bulkwrite-update_error-008.phpt
deleted file mode 100644
index 5de3ca34d..000000000
--- a/tests/bulk/bulkwrite-update_error-008.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-MongoDB\Driver\BulkWrite::update() hint option requires MongoDB 4.2 (server-side error)
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_live(); ?>
-<?php skip_if_server_version('>=', '4.2'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-$manager = create_test_manager();
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->update(['_id' => 1], ['$set' => ['x' => 11]], ['hint' => '_id_']);
-
-echo throws(function() use ($manager, $bulk) {
-    $manager->executeBulkWrite(NS, $bulk);
-}, 'MongoDB\Driver\Exception\BulkWriteException'), "\n";
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-OK: Got MongoDB\Driver\Exception\BulkWriteException
-BSON field 'update.updates.hint' is an unknown field.
-===DONE===
diff --git a/tests/clientEncryption/bug2149.phpt b/tests/clientEncryption/bug2149.phpt
index 95162394b..870d67348 100644
--- a/tests/clientEncryption/bug2149.phpt
+++ b/tests/clientEncryption/bug2149.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::createDataKey() may leak "masterKey" option
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-addKeyAltName-001.phpt b/tests/clientEncryption/clientEncryption-addKeyAltName-001.phpt
index 4e44943c4..5107b1d41 100644
--- a/tests/clientEncryption/clientEncryption-addKeyAltName-001.phpt
+++ b/tests/clientEncryption/clientEncryption-addKeyAltName-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::addKeyAltName()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-addKeyAltName-002.phpt b/tests/clientEncryption/clientEncryption-addKeyAltName-002.phpt
index eda6de2c7..7a618014d 100644
--- a/tests/clientEncryption/clientEncryption-addKeyAltName-002.phpt
+++ b/tests/clientEncryption/clientEncryption-addKeyAltName-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::addKeyAltName() when key does not exist
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-createDataKey-001.phpt b/tests/clientEncryption/clientEncryption-createDataKey-001.phpt
index c4969184e..bfa29fd3d 100644
--- a/tests/clientEncryption/clientEncryption-createDataKey-001.phpt
+++ b/tests/clientEncryption/clientEncryption-createDataKey-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::createDataKey()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-createDataKey-002.phpt b/tests/clientEncryption/clientEncryption-createDataKey-002.phpt
index 8baccdce8..4e94b56d1 100644
--- a/tests/clientEncryption/clientEncryption-createDataKey-002.phpt
+++ b/tests/clientEncryption/clientEncryption-createDataKey-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::createDataKey() "keyAltNames" option
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-decrypt-001.phpt b/tests/clientEncryption/clientEncryption-decrypt-001.phpt
index df5d94e87..8136d0d2e 100644
--- a/tests/clientEncryption/clientEncryption-decrypt-001.phpt
+++ b/tests/clientEncryption/clientEncryption-decrypt-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::decrypt()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
diff --git a/tests/clientEncryption/clientEncryption-deleteKey-001.phpt b/tests/clientEncryption/clientEncryption-deleteKey-001.phpt
index e255e6c5f..74c648ba0 100644
--- a/tests/clientEncryption/clientEncryption-deleteKey-001.phpt
+++ b/tests/clientEncryption/clientEncryption-deleteKey-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::deleteKey()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-deleteKey-002.phpt b/tests/clientEncryption/clientEncryption-deleteKey-002.phpt
index 7d4fd05c6..1661a3a42 100644
--- a/tests/clientEncryption/clientEncryption-deleteKey-002.phpt
+++ b/tests/clientEncryption/clientEncryption-deleteKey-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::deleteKey() when key does not exist
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-encrypt-001.phpt b/tests/clientEncryption/clientEncryption-encrypt-001.phpt
index 3eb5a2bcc..2531464e9 100644
--- a/tests/clientEncryption/clientEncryption-encrypt-001.phpt
+++ b/tests/clientEncryption/clientEncryption-encrypt-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::encrypt()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
diff --git a/tests/clientEncryption/clientEncryption-getKey-001.phpt b/tests/clientEncryption/clientEncryption-getKey-001.phpt
index 60dfb1c16..7599f4061 100644
--- a/tests/clientEncryption/clientEncryption-getKey-001.phpt
+++ b/tests/clientEncryption/clientEncryption-getKey-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKey()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKey-002.phpt b/tests/clientEncryption/clientEncryption-getKey-002.phpt
index f5f977c1f..5269d304e 100644
--- a/tests/clientEncryption/clientEncryption-getKey-002.phpt
+++ b/tests/clientEncryption/clientEncryption-getKey-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKey() when key does not exist
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKeyByAltName-001.phpt b/tests/clientEncryption/clientEncryption-getKeyByAltName-001.phpt
index f960615a2..1b186c65d 100644
--- a/tests/clientEncryption/clientEncryption-getKeyByAltName-001.phpt
+++ b/tests/clientEncryption/clientEncryption-getKeyByAltName-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKeyByAltName()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKeyByAltName-002.phpt b/tests/clientEncryption/clientEncryption-getKeyByAltName-002.phpt
index 6081e484d..8e375b7fc 100644
--- a/tests/clientEncryption/clientEncryption-getKeyByAltName-002.phpt
+++ b/tests/clientEncryption/clientEncryption-getKeyByAltName-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKeyByAltName() when key does not exist
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKeys-001.phpt b/tests/clientEncryption/clientEncryption-getKeys-001.phpt
index fa4632e77..23bd59f44 100644
--- a/tests/clientEncryption/clientEncryption-getKeys-001.phpt
+++ b/tests/clientEncryption/clientEncryption-getKeys-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKeys()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKeys-002.phpt b/tests/clientEncryption/clientEncryption-getKeys-002.phpt
index e3b90ba68..4c229f332 100644
--- a/tests/clientEncryption/clientEncryption-getKeys-002.phpt
+++ b/tests/clientEncryption/clientEncryption-getKeys-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKeys() with empty key vault
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-getKeys-003.phpt b/tests/clientEncryption/clientEncryption-getKeys-003.phpt
index 11654a310..1d2390dd4 100644
--- a/tests/clientEncryption/clientEncryption-getKeys-003.phpt
+++ b/tests/clientEncryption/clientEncryption-getKeys-003.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::getKeys() cursor debug info
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-removeKeyAltName-001.phpt b/tests/clientEncryption/clientEncryption-removeKeyAltName-001.phpt
index c4d27ec24..006ed868c 100644
--- a/tests/clientEncryption/clientEncryption-removeKeyAltName-001.phpt
+++ b/tests/clientEncryption/clientEncryption-removeKeyAltName-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-removeKeyAltName-002.phpt b/tests/clientEncryption/clientEncryption-removeKeyAltName-002.phpt
index 94ded1bda..9c03a1fa2 100644
--- a/tests/clientEncryption/clientEncryption-removeKeyAltName-002.phpt
+++ b/tests/clientEncryption/clientEncryption-removeKeyAltName-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName() when key does not exist
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-removeKeyAltName-003.phpt b/tests/clientEncryption/clientEncryption-removeKeyAltName-003.phpt
index 6816b6003..5815493f4 100644
--- a/tests/clientEncryption/clientEncryption-removeKeyAltName-003.phpt
+++ b/tests/clientEncryption/clientEncryption-removeKeyAltName-003.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName() when keyAltName does not exi
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-001.phpt b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-001.phpt
index 288f33050..b649db6fb 100644
--- a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-001.phpt
+++ b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-001.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::rewrapManyDataKey()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-002.phpt b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-002.phpt
index 2329ed720..725d1368a 100644
--- a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-002.phpt
+++ b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-002.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::rewrapManyDataKey() when filter matches no keys
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-003.phpt b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-003.phpt
index 700cbd0d1..cc35a5352 100644
--- a/tests/clientEncryption/clientEncryption-rewrapManyDataKey-003.phpt
+++ b/tests/clientEncryption/clientEncryption-rewrapManyDataKey-003.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\ClientEncryption::rewrapManyDataKey() accepts null for $options
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
 --FILE--
 <?php
diff --git a/tests/cursor/bug1419-001.phpt b/tests/cursor/bug1419-001.phpt
index a22f781f8..c755020f9 100644
--- a/tests/cursor/bug1419-001.phpt
+++ b/tests/cursor/bug1419-001.phpt
@@ -3,8 +3,7 @@ PHPC-1419: error labels from getMore are not exposed
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
-<?php skip_if_server_version('<', '4.1.11'); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/cursor/bug1529-001.phpt b/tests/cursor/bug1529-001.phpt
index 53c816d21..1398a8b7b 100644
--- a/tests/cursor/bug1529-001.phpt
+++ b/tests/cursor/bug1529-001.phpt
@@ -4,7 +4,6 @@ PHPC-1529: Resetting a client should also reset the keyVaultClient
 <?php if (!function_exists('pcntl_fork')) { die('skip pcntl_fork() not available'); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_server_version('<', '4.2'); ?>
 <?php skip_if_not_libmongocrypt(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_crypt_shared(); // Build fails due to SERVER-71049 ?>
diff --git a/tests/cursor/cursor-getmore-005.phpt b/tests/cursor/cursor-getmore-005.phpt
index 6b0c181a1..2517ec26a 100644
--- a/tests/cursor/cursor-getmore-005.phpt
+++ b/tests/cursor/cursor-getmore-005.phpt
@@ -9,7 +9,7 @@ MongoDB\Driver\Cursor query result iteration with getmore failure
 ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_standalone(); ?>
-<?php skip_if_no_getmore_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_auth(); ?>
 <?php skip_if_no_mongo_orchestration(); ?>
 --FILE--
diff --git a/tests/cursor/cursor-getmore-006.phpt b/tests/cursor/cursor-getmore-006.phpt
index aba79f401..af9b55ac1 100644
--- a/tests/cursor/cursor-getmore-006.phpt
+++ b/tests/cursor/cursor-getmore-006.phpt
@@ -9,7 +9,7 @@ MongoDB\Driver\Cursor command result iteration with getmore failure
 ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_standalone(); ?>
-<?php skip_if_no_getmore_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_auth(); ?>
 <?php skip_if_no_mongo_orchestration(); ?>
 --FILE--
diff --git a/tests/exception/bulkwriteexception-haserrorlabel-002.phpt b/tests/exception/bulkwriteexception-haserrorlabel-002.phpt
index 50af60496..f7b294b97 100644
--- a/tests/exception/bulkwriteexception-haserrorlabel-002.phpt
+++ b/tests/exception/bulkwriteexception-haserrorlabel-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Exception\BulkWriteException::hasErrorLabel() with writeConcernEr
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeBulkWrite_error-005.phpt b/tests/manager/manager-executeBulkWrite_error-005.phpt
index 3ce2e6de2..10b3af69b 100644
--- a/tests/manager/manager-executeBulkWrite_error-005.phpt
+++ b/tests/manager/manager-executeBulkWrite_error-005.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Manager::executeBulkWrite() WriteResult accessible for network er
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeBulkWrite_error-011.phpt b/tests/manager/manager-executeBulkWrite_error-011.phpt
deleted file mode 100644
index 14f7d20ed..000000000
--- a/tests/manager/manager-executeBulkWrite_error-011.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-MongoDB\Driver\Manager::executeBulkWrite() BulkWriteException inherits labels from previous exception
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set_or_sharded_cluster_with_replica_set(); ?>
-<?php skip_if_server_version('<', '4.0'); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
-<?php skip_if_not_clean(); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-$manager = create_test_manager();
-
-// Select a specific server for future operations to avoid mongos switching in sharded clusters
-$server = $manager->selectServer(new \MongoDB\Driver\ReadPreference('primary'));
-
-// Create collection since it can't be (automatically) done within the transaction
-$majority = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY);
-$server->executeWriteCommand(
-    DATABASE_NAME,
-    new MongoDB\Driver\Command(['create' => COLLECTION_NAME]),
-    ['writeConcern' => $majority]
-);
-
-configureTargetedFailPoint($server, 'failCommand', [ 'times' => 1 ], [
-  'failCommands' => ['insert'],
-  'closeConnection' => true,
-]);
-
-$session = $manager->startSession();
-$session->startTransaction();
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-try {
-    $server->executeBulkWrite(NS, $bulk, ['session' => $session]);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    printf("%s(%d): %s\n", get_class($e), $e->getCode(), $e->getMessage());
-    var_dump($e->hasErrorLabel('TransientTransactionError'));
-    $prev = $e->getPrevious();
-    printf("%s(%d): %s\n", get_class($prev), $prev->getCode(), $prev->getMessage());
-    var_dump($prev->hasErrorLabel('TransientTransactionError'));
-}
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-MongoDB\Driver\Exception\BulkWriteException(0): Bulk write failed due to previous MongoDB\Driver\Exception\ConnectionTimeoutException: Failed to send "insert" command with database "%s": Failed to read 4 bytes: socket error or timeout
-bool(true)
-MongoDB\Driver\Exception\ConnectionTimeoutException(%d): Failed to send "insert" command with database "%s": Failed to read 4 bytes: socket error or timeout
-bool(true)
-===DONE===
diff --git a/tests/retryable-reads/retryable-reads-001.phpt b/tests/retryable-reads/retryable-reads-001.phpt
index 886615284..5c880b114 100644
--- a/tests/retryable-reads/retryable-reads-001.phpt
+++ b/tests/retryable-reads/retryable-reads-001.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeReadCommand is retried once
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-reads/retryable-reads-002.phpt b/tests/retryable-reads/retryable-reads-002.phpt
index e1855f5fd..7bbd3ea62 100644
--- a/tests/retryable-reads/retryable-reads-002.phpt
+++ b/tests/retryable-reads/retryable-reads-002.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeQuery is retried once
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-reads/retryable-reads_error-001.phpt b/tests/retryable-reads/retryable-reads_error-001.phpt
index fa96eecc6..4098cf5d7 100644
--- a/tests/retryable-reads/retryable-reads_error-001.phpt
+++ b/tests/retryable-reads/retryable-reads_error-001.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeReadCommand is not retried when retryable reads are disa
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/retryable-reads/retryable-reads_error-002.phpt b/tests/retryable-reads/retryable-reads_error-002.phpt
index 78fb21a11..539d2de46 100644
--- a/tests/retryable-reads/retryable-reads_error-002.phpt
+++ b/tests/retryable-reads/retryable-reads_error-002.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeQuery is not retried when retryable reads are disabled
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-isDirty-001.phpt b/tests/session/session-isDirty-001.phpt
index 52a5eb15d..714b847a3 100644
--- a/tests/session/session-isDirty-001.phpt
+++ b/tests/session/session-isDirty-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::isDirty()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-startTransaction_error-006.phpt b/tests/session/session-startTransaction_error-006.phpt
deleted file mode 100644
index 9c05b7cf2..000000000
--- a/tests/session/session-startTransaction_error-006.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-MongoDB\Driver\Session::startTransaction() throws an error on replicasets < 4.0
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
-<?php skip_if_server_version('>=', '4.0'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-$manager = create_test_manager();
-$session = $manager->startSession();
-
-echo throws(function () use ($session) {
-    $session->startTransaction();
-}, MongoDB\Driver\Exception\RuntimeException::class), "\n";
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-OK: Got MongoDB\Driver\Exception\RuntimeException
-Multi-document transactions are not supported by this server version
-===DONE===
diff --git a/tests/session/session-startTransaction_error-007.phpt b/tests/session/session-startTransaction_error-007.phpt
deleted file mode 100644
index a64bedf70..000000000
--- a/tests/session/session-startTransaction_error-007.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-MongoDB\Driver\Session::startTransaction() throws an error on sharded clusters < 4.2
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_sharded_cluster_with_replica_set(); ?>
-<?php skip_if_server_version('>=', '4.2'); ?>
---FILE--
-<?php
-require_once __DIR__ . "/../utils/basic.inc";
-
-$manager = create_test_manager();
-$session = $manager->startSession();
-
-echo throws(function () use ($session) {
-    $session->startTransaction();
-}, MongoDB\Driver\Exception\RuntimeException::class), "\n";
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-OK: Got MongoDB\Driver\Exception\RuntimeException
-Multi-document transactions are not supported by this server version
-===DONE===
diff --git a/tests/utils/skipif.php b/tests/utils/skipif.php
index f758fcf30..873275314 100644
--- a/tests/utils/skipif.php
+++ b/tests/utils/skipif.php
@@ -109,11 +109,7 @@ function skip_if_not_replica_set_or_sharded_cluster_with_replica_set()
 
 function skip_if_no_transactions()
 {
-    if (is_sharded_cluster_with_replica_set(URI)) {
-        skip_if_server_version('<', '4.2');
-    } elseif (is_replica_set(URI)) {
-        skip_if_server_version('<', '4.0');
-    } else {
+    if (! is_sharded_cluster_with_replica_set(URI) && ! is_replica_set(URI)) {
         exit('skip topology does not support transactions');
     }
 }
@@ -440,28 +436,6 @@ function skip_if_not_clean($databaseName = DATABASE_NAME, $collectionName = COLL
     disable_skipif_caching();
 }
 
-function skip_if_no_getmore_failpoint()
-{
-    $serverVersion = get_server_version(URI);
-
-    if (version_compare($serverVersion, '4.0', '<')) {
-        exit("skip Server version '$serverVersion' does not support a getMore failpoint'");
-    }
-}
-
-function skip_if_no_failcommand_failpoint()
-{
-    skip_if_test_commands_disabled();
-
-    $serverVersion = get_server_version(URI);
-
-    if (is_mongos(URI) && version_compare($serverVersion, '4.1.8', '<')) {
-        exit("skip mongos version '$serverVersion' does not support 'failCommand' failpoint'");
-    } elseif (version_compare($serverVersion, '4.0', '<')) {
-        exit("skip mongod version '$serverVersion' does not support 'failCommand' failpoint'");
-    }
-}
-
 function skip_if_no_mongo_orchestration()
 {
     $ctx = stream_context_create(['http' => ['timeout' => 0.5]]);
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
index 79f304d10..1889b228d 100644
--- a/tests/utils/tools.php
+++ b/tests/utils/tools.php
@@ -837,17 +837,12 @@ function failGetMore(Manager $manager)
     $primary = $manager->selectServer(new ReadPreference('primary'));
     $version = get_server_version_from_server($primary);
 
-    if (version_compare($version, "4.0", ">=")) {
-        /* We use 237 here, as that's the same original code that MongoD would
-         * throw if a cursor had already gone by the time we call getMore. This
-         * allows us to make things consistent with the getMore OP behaviour
-         * from previous mongod versions. An errorCode is required here for the
-         * failPoint to work. */
-        configureFailPoint($manager, 'failCommand', 'alwaysOn', [ 'errorCode' => 237, 'failCommands' => ['getMore'] ]);
-        return;
-    }
-
-    throw new Exception("Trying to configure a getMore fail point for a server version ($version) that doesn't support it");
+    /* We use 237 here, as that's the same original code that MongoD would
+     * throw if a cursor had already gone by the time we call getMore. This
+     * allows us to make things consistent with the getMore OP behaviour
+     * from previous mongod versions. An errorCode is required here for the
+     * failPoint to work. */
+    configureFailPoint($manager, 'failCommand', 'alwaysOn', [ 'errorCode' => 237, 'failCommands' => ['getMore'] ]);
 }
 
 function createDBPointer(string $collection = 'phongo.test', string $id = '5a2e78accd485d55b4050000'): DBPointer
diff --git a/tests/writeConcernError/writeconcernerror-getinfo-001.phpt b/tests/writeConcernError/writeconcernerror-getinfo-001.phpt
index 4abf46a48..70565d446 100644
--- a/tests/writeConcernError/writeconcernerror-getinfo-001.phpt
+++ b/tests/writeConcernError/writeconcernerror-getinfo-001.phpt
@@ -6,7 +6,7 @@ https://github.com/mongodb/specifications/blob/master/source/crud/tests/README.r
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/writeResult/writeresult-getErrorReplies-001.phpt b/tests/writeResult/writeresult-getErrorReplies-001.phpt
index ac4f9bb4c..d247c2bb8 100644
--- a/tests/writeResult/writeresult-getErrorReplies-001.phpt
+++ b/tests/writeResult/writeresult-getErrorReplies-001.phpt
@@ -4,7 +4,7 @@ MongoDB\Driver\WriteResult::getErrorReplies()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_clean(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/writeResult/writeresult-getwriteconcernerror-002.phpt b/tests/writeResult/writeresult-getwriteconcernerror-002.phpt
index eb3cd62f2..580291db2 100644
--- a/tests/writeResult/writeresult-getwriteconcernerror-002.phpt
+++ b/tests/writeResult/writeresult-getwriteconcernerror-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\WriteResult::getWriteConcernError() works for errors without a me
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_mongos(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php