diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d6c38f5..8b87748 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,6 +25,7 @@ jobs:
           - '7.1'
           - '7.0'
         phpunit-version:
+          - '12.5.0'
           - '12.4.0'
           - '12.3.0'
           - '12.2.0'
@@ -207,6 +208,8 @@ jobs:
             phpunit-version: '6.0.0'
 
           # PHP 8.2 Exclusions
+          - php-version: '8.2'
+            phpunit-version: '12.5.0'
           - php-version: '8.2'
             phpunit-version: '12.4.0'
           - php-version: '8.2'
@@ -263,6 +266,8 @@ jobs:
             phpunit-version: '6.0.0'
 
           # PHP 8.1 Exclusions
+          - php-version: '8.1'
+            phpunit-version: '12.5.0'
           - php-version: '8.1'
             phpunit-version: '12.4.0'
           - php-version: '8.1'
@@ -331,6 +336,8 @@ jobs:
             phpunit-version: '6.0.0'
 
           # PHP 8.0 Exclusions
+          - php-version: '8.0'
+            phpunit-version: '12.5.0'
           - php-version: '8.0'
             phpunit-version: '12.4.0'
           - php-version: '8.0'
@@ -407,6 +414,8 @@ jobs:
             phpunit-version: '6.0.0'
             
           # PHP 7.4 Exclusions
+          - php-version: '7.4'
+            phpunit-version: '12.5.0'
           - php-version: '7.4'
             phpunit-version: '12.4.0'
           - php-version: '7.4'
@@ -469,6 +478,8 @@ jobs:
             phpunit-version: '6.0.0'
 
           # PHP 7.3 Exclusions
+          - php-version: '7.3'
+            phpunit-version: '12.5.0'
           - php-version: '7.3'
             phpunit-version: '12.4.0'
           - php-version: '7.3'
@@ -505,6 +516,8 @@ jobs:
             phpunit-version: '10.0.0'
           
           # PHP 7.2 Exclusions
+          - php-version: '7.2'
+            phpunit-version: '12.5.0'
           - php-version: '7.2'
             phpunit-version: '12.4.0'
           - php-version: '7.2'
@@ -555,6 +568,8 @@ jobs:
             phpunit-version: '9.0.0'
           
           # PHP 7.1 Exclusions
+          - php-version: '7.1'
+            phpunit-version: '12.5.0'
           - php-version: '7.1'
             phpunit-version: '12.4.0'
           - php-version: '7.1'
@@ -617,6 +632,8 @@ jobs:
             phpunit-version: '8.0.0'
       
           # PHP 7.0 Exclusions
+          - php-version: '7.0'
+            phpunit-version: '12.5.0'
           - php-version: '7.0'
             phpunit-version: '12.4.0'
           - php-version: '7.0'
diff --git a/tests/MockDisablerTest.php b/tests/MockDisablerTest.php
index 4dbadca..ca221ac 100644
--- a/tests/MockDisablerTest.php
+++ b/tests/MockDisablerTest.php
@@ -38,7 +38,11 @@ public function testCallback()
     {
         $executed = false;
         $executedWith = null;
-        $mock = $this->createMock(Deactivatable::class);
+
+        $mock = method_exists($this, 'createStub')
+            ? $this->createStub(Deactivatable::class)
+            : $this->createMock(Deactivatable::class);
+
         $disabler = new MockDisabler($mock, static function ($disabler) use (&$executed, &$executedWith) {
             self::assertInstanceOf(MockDisabler::class, $disabler);
 
diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php
index 40c52a8..75376cf 100644
--- a/tests/MockObjectProxyTest.php
+++ b/tests/MockObjectProxyTest.php
@@ -33,7 +33,9 @@ class MockObjectProxyTest extends TestCase
      */
     public function testExpects()
     {
-        $matcher = $this->getMockBuilder(Invocation::class)->getMock();
+        $matcher = method_exists($this, 'createStub')
+            ? $this->createStub(Invocation::class)
+            : $this->createMock(Invocation::class);
 
         if (class_exists(ConfigurableMethod::class)) {
             if (class_exists(\PHPUnit\Runner\Version::class)