diff --git a/src/Worker/Transport/Command/Client/Request.php b/src/Worker/Transport/Command/Client/Request.php
index d39819961..a6cde2cbb 100644
--- a/src/Worker/Transport/Command/Client/Request.php
+++ b/src/Worker/Transport/Command/Client/Request.php
@@ -48,6 +48,14 @@ public function __construct(
         $this->id = $this->getNextID();
     }
 
+    /**
+     * @internal
+     */
+    public static function resetLastId(int $lastID): void
+    {
+        self::$lastID = $lastID;
+    }
+
     public function getID(): int
     {
         return $this->id;
@@ -65,12 +73,14 @@ public function getFailure(): ?\Throwable
 
     private function getNextID(): int
     {
-        $next = ++static::$lastID;
+        ++static::$lastID;
 
-        if ($next >= \PHP_INT_MAX) {
-            $next = static::$lastID = 1;
+        if (static::$lastID === \PHP_INT_MAX) {
+            static::$lastID = 1;
         }
 
-        return $next;
+        return static::$lastID;
     }
 }
+
+Request::resetLastId((int) (\microtime(true) * 1_000_000.0));
diff --git a/tests/Fixtures/CommandResetter.php b/tests/Fixtures/CommandResetter.php
deleted file mode 100644
index afb13f529..000000000
--- a/tests/Fixtures/CommandResetter.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * This file is part of Temporal package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Temporal\Tests\Fixtures;
-
-use Temporal\Worker\Transport\Command\Client\Request;
-
-class CommandResetter extends Request
-{
-    public static function reset()
-    {
-        self::$lastID = 9000;
-    }
-}
diff --git a/tests/Fixtures/WorkerMock.php b/tests/Fixtures/WorkerMock.php
index 27cd693c4..14772eebe 100644
--- a/tests/Fixtures/WorkerMock.php
+++ b/tests/Fixtures/WorkerMock.php
@@ -15,6 +15,7 @@
 use Temporal\DataConverter\DataConverter;
 use Temporal\Exception\Failure\FailureConverter;
 use Temporal\Tests\TestCase;
+use Temporal\Worker\Transport\Command\Client\Request;
 use Temporal\Worker\Transport\HostConnectionInterface;
 use Temporal\Worker\WorkerFactoryInterface;
 use Temporal\WorkerFactory;
@@ -45,7 +46,7 @@ public static function createMock(): WorkerMock
         $mock->factory = WorkerFactory::create();
         $mock->registerWorkflowAndActivities();
 
-        CommandResetter::reset();
+        Request::resetLastId(9000);
 
         return $mock;
     }