diff --git a/tests/UnifiedSpecTests/Context.php b/tests/UnifiedSpecTests/Context.php
index 56f68adc0..fde8e3ee4 100644
--- a/tests/UnifiedSpecTests/Context.php
+++ b/tests/UnifiedSpecTests/Context.php
@@ -38,6 +38,8 @@
  */
 final class Context
 {
+    use ManagesFailPointsTrait;
+
     private ?string $activeClient = null;
 
     private EntityMap $entityMap;
diff --git a/tests/UnifiedSpecTests/FailPointObserver.php b/tests/UnifiedSpecTests/FailPointObserver.php
deleted file mode 100644
index f843d43fb..000000000
--- a/tests/UnifiedSpecTests/FailPointObserver.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace MongoDB\Tests\UnifiedSpecTests;
-
-use MongoDB\Driver\Monitoring\CommandFailedEvent;
-use MongoDB\Driver\Monitoring\CommandStartedEvent;
-use MongoDB\Driver\Monitoring\CommandSubscriber;
-use MongoDB\Driver\Monitoring\CommandSucceededEvent;
-use MongoDB\Operation\DatabaseCommand;
-
-use function MongoDB\Driver\Monitoring\addSubscriber;
-use function MongoDB\Driver\Monitoring\removeSubscriber;
-
-class FailPointObserver implements CommandSubscriber
-{
-    private array $failPointsAndServers = [];
-
-    /** @see https://php.net/manual/en/mongodb-driver-monitoring-commandsubscriber.commandfailed.php */
-    public function commandFailed(CommandFailedEvent $event): void
-    {
-    }
-
-    /** @see https://php.net/manual/en/mongodb-driver-monitoring-commandsubscriber.commandstarted.php */
-    public function commandStarted(CommandStartedEvent $event): void
-    {
-        $command = $event->getCommand();
-
-        if (! isset($command->configureFailPoint)) {
-            return;
-        }
-
-        if (isset($command->mode) && $command->mode === 'off') {
-            return;
-        }
-
-        $this->failPointsAndServers[] = [$command->configureFailPoint, $event->getServer()];
-    }
-
-    /** @see https://php.net/manual/en/mongodb-driver-monitoring-commandsubscriber.commandsucceeded.php */
-    public function commandSucceeded(CommandSucceededEvent $event): void
-    {
-    }
-
-    public function disableFailPoints(): void
-    {
-        foreach ($this->failPointsAndServers as [$failPoint, $server]) {
-            $operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
-            $operation->execute($server);
-        }
-
-        $this->failPointsAndServers = [];
-    }
-
-    public function start(): void
-    {
-        addSubscriber($this);
-    }
-
-    public function stop(): void
-    {
-        removeSubscriber($this);
-    }
-}
diff --git a/tests/UnifiedSpecTests/ManagesFailPointsTrait.php b/tests/UnifiedSpecTests/ManagesFailPointsTrait.php
new file mode 100644
index 000000000..d88368fa9
--- /dev/null
+++ b/tests/UnifiedSpecTests/ManagesFailPointsTrait.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace MongoDB\Tests\UnifiedSpecTests;
+
+use MongoDB\Driver\Server;
+use MongoDB\Operation\DatabaseCommand;
+use stdClass;
+
+use function PHPUnit\Framework\assertIsString;
+use function PHPUnit\Framework\assertObjectHasAttribute;
+
+trait ManagesFailPointsTrait
+{
+    /** @var list<list{string, Server}> */
+    private array $failPointsAndServers = [];
+
+    public function configureFailPoint(stdClass $failPoint, Server $server): void
+    {
+        assertObjectHasAttribute('configureFailPoint', $failPoint);
+        assertIsString($failPoint->configureFailPoint);
+        assertObjectHasAttribute('mode', $failPoint);
+
+        $operation = new DatabaseCommand('admin', $failPoint);
+        $operation->execute($server);
+
+        if ($failPoint->mode !== 'off') {
+            $this->failPointsAndServers[] = [$failPoint->configureFailPoint, $server];
+        }
+    }
+
+    public function disableFailPoints(): void
+    {
+        foreach ($this->failPointsAndServers as [$failPoint, $server]) {
+            $operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
+            $operation->execute($server);
+        }
+
+        $this->failPointsAndServers = [];
+    }
+}
diff --git a/tests/UnifiedSpecTests/Operation.php b/tests/UnifiedSpecTests/Operation.php
index 68383443e..9957af855 100644
--- a/tests/UnifiedSpecTests/Operation.php
+++ b/tests/UnifiedSpecTests/Operation.php
@@ -16,7 +16,6 @@
 use MongoDB\Model\CollectionInfo;
 use MongoDB\Model\DatabaseInfo;
 use MongoDB\Model\IndexInfo;
-use MongoDB\Operation\DatabaseCommand;
 use MongoDB\Operation\FindOneAndReplace;
 use MongoDB\Operation\FindOneAndUpdate;
 use PHPUnit\Framework\Assert;
@@ -905,7 +904,8 @@ private function executeForTestRunner()
                 assertArrayHasKey('failPoint', $args);
                 assertInstanceOf(Client::class, $args['client']);
                 assertInstanceOf(stdClass::class, $args['failPoint']);
-                $args['client']->selectDatabase('admin')->command($args['failPoint']);
+                // Configure the fail point via the Context so it can later be disabled
+                $this->context->configureFailPoint($args['failPoint'], $args['client']->getManager()->selectServer());
                 break;
             case 'targetedFailPoint':
                 assertArrayHasKey('session', $args);
@@ -913,8 +913,8 @@ private function executeForTestRunner()
                 assertInstanceOf(Session::class, $args['session']);
                 assertInstanceOf(stdClass::class, $args['failPoint']);
                 assertNotNull($args['session']->getServer(), 'Session is pinned');
-                $operation = new DatabaseCommand('admin', $args['failPoint']);
-                $operation->execute($args['session']->getServer());
+                // Configure the fail point via the Context so it can later be disabled
+                $this->context->configureFailPoint($args['failPoint'], $args['session']->getServer());
                 break;
             case 'loop':
                 assertArrayHasKey('operations', $args);
diff --git a/tests/UnifiedSpecTests/UnifiedTestRunner.php b/tests/UnifiedSpecTests/UnifiedTestRunner.php
index 39ea3832d..93d3a3421 100644
--- a/tests/UnifiedSpecTests/UnifiedTestRunner.php
+++ b/tests/UnifiedSpecTests/UnifiedTestRunner.php
@@ -75,8 +75,6 @@ final class UnifiedTestRunner
     /** @var callable(EntityMap):void */
     private $entityMapObserver;
 
-    private ?FailPointObserver $failPointObserver = null;
-
     private ServerParameterHelper $serverParameterHelper;
 
     public function __construct(private string $internalClientUri)
@@ -147,9 +145,6 @@ private function doSetUp(): void
          * after transient error within a transaction" pinning test causes the
          * subsequent transaction test to block. */
         $this->killAllSessions();
-
-        $this->failPointObserver = new FailPointObserver();
-        $this->failPointObserver->start();
     }
 
     private function doTearDown(bool $hasFailed): void
@@ -160,9 +155,6 @@ private function doTearDown(bool $hasFailed): void
             $this->killAllSessions();
         }
 
-        $this->failPointObserver->stop();
-        $this->failPointObserver->disableFailPoints();
-
         /* Manually invoking garbage collection since each test is prone to
          * create cycles (perhaps due to EntityMap), which can leak and prevent
          * sessions from being released back into the pool. */
@@ -213,14 +205,17 @@ private function doTestCase(stdClass $test, string $schemaVersion, ?array $runOn
         $context->startEventObservers();
         $context->startEventCollectors();
 
-        foreach ($test->operations as $o) {
-            $operation = new Operation($o, $context);
-            $operation->assert();
+        try {
+            foreach ($test->operations as $o) {
+                $operation = new Operation($o, $context);
+                $operation->assert();
+            }
+        } finally {
+            $context->stopEventObservers();
+            $context->stopEventCollectors();
+            $context->disableFailPoints();
         }
 
-        $context->stopEventObservers();
-        $context->stopEventCollectors();
-
         if (isset($test->expectEvents)) {
             assertIsArray($test->expectEvents);
             $context->assertExpectedEventsForClients($test->expectEvents);