diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 22f047a7..65e4c6c5 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -55,20 +55,12 @@
         'return_assignment' => false,
         'comment_to_phpdoc' => false,
         'general_phpdoc_annotation_remove' => [
-            'annotations' => ['author', 'copyright', 'throws'],
+            'annotations' => ['author', 'copyright'],
         ],
 
         // fn => without curly brackets is less readable,
         // also prevent bounding of unwanted variables for GC
         'use_arrow_functions' => false,
-
-        // TODO disable too strict rules for now
-        'declare_strict_types' => false,
-        'general_phpdoc_annotation_remove' => false,
-        'php_unit_data_provider_static' => false,
-        'php_unit_strict' => false,
-        'phpdoc_to_comment' => false,
-        'strict_comparison' => false,
     ])
     ->setFinder($finder)
     ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer.' . md5(__DIR__) . '.cache');
diff --git a/tests/mutex/CASMutexTest.php b/tests/mutex/CASMutexTest.php
index 969ae30e..6c278d37 100644
--- a/tests/mutex/CASMutexTest.php
+++ b/tests/mutex/CASMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
diff --git a/tests/mutex/FlockMutexTest.php b/tests/mutex/FlockMutexTest.php
index 26727a6b..37101467 100644
--- a/tests/mutex/FlockMutexTest.php
+++ b/tests/mutex/FlockMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use Eloquent\Liberator\Liberator;
diff --git a/tests/mutex/LockMutexTest.php b/tests/mutex/LockMutexTest.php
index 42398f17..2eedaab6 100644
--- a/tests/mutex/LockMutexTest.php
+++ b/tests/mutex/LockMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
diff --git a/tests/mutex/MemcachedMutexTest.php b/tests/mutex/MemcachedMutexTest.php
index 098f86ef..88cbf054 100644
--- a/tests/mutex/MemcachedMutexTest.php
+++ b/tests/mutex/MemcachedMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockReleaseException;
diff --git a/tests/mutex/MutexConcurrencyTest.php b/tests/mutex/MutexConcurrencyTest.php
index 137d6bd1..b114ddc2 100644
--- a/tests/mutex/MutexConcurrencyTest.php
+++ b/tests/mutex/MutexConcurrencyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use Eloquent\Liberator\Liberator;
diff --git a/tests/mutex/MutexTest.php b/tests/mutex/MutexTest.php
index 2af83576..bcf9b318 100644
--- a/tests/mutex/MutexTest.php
+++ b/tests/mutex/MutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use Eloquent\Liberator\Liberator;
diff --git a/tests/mutex/PHPRedisMutexTest.php b/tests/mutex/PHPRedisMutexTest.php
index 03d8d6c9..11c2819b 100644
--- a/tests/mutex/PHPRedisMutexTest.php
+++ b/tests/mutex/PHPRedisMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
diff --git a/tests/mutex/PgAdvisoryLockMutexTest.php b/tests/mutex/PgAdvisoryLockMutexTest.php
index 44a2d461..a3a20f7d 100644
--- a/tests/mutex/PgAdvisoryLockMutexTest.php
+++ b/tests/mutex/PgAdvisoryLockMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\mutex\PgAdvisoryLockMutex;
diff --git a/tests/mutex/PredisMutexTest.php b/tests/mutex/PredisMutexTest.php
index 06fe52cb..41eff431 100644
--- a/tests/mutex/PredisMutexTest.php
+++ b/tests/mutex/PredisMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
diff --git a/tests/mutex/RedisMutexTest.php b/tests/mutex/RedisMutexTest.php
index dd3c4229..46bd72c5 100644
--- a/tests/mutex/RedisMutexTest.php
+++ b/tests/mutex/RedisMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
diff --git a/tests/mutex/SpinlockMutexTest.php b/tests/mutex/SpinlockMutexTest.php
index ed94d27a..b1f480f4 100644
--- a/tests/mutex/SpinlockMutexTest.php
+++ b/tests/mutex/SpinlockMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\ExecutionOutsideLockException;
diff --git a/tests/mutex/TransactionalMutexTest.php b/tests/mutex/TransactionalMutexTest.php
index 9bee8c70..a41112c3 100644
--- a/tests/mutex/TransactionalMutexTest.php
+++ b/tests/mutex/TransactionalMutexTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\mutex;
 
 use malkusch\lock\exception\LockAcquireException;
@@ -81,7 +83,7 @@ public function testExceptionRollsback(): void
         }
 
         $count = $pdo->query('SELECT count(*) FROM testExceptionRollsback')->fetchColumn();
-        self::assertEquals(0, $count);
+        self::assertSame(0, \PHP_VERSION_ID < 8_10_00 ? (int) $count : $count);
     }
 
     /**
@@ -123,7 +125,7 @@ public function testReplayTransaction(\Exception $exception): void
             ++$i;
 
             $count = $pdo->query('SELECT count(*) FROM testExceptionRollsback')->fetchColumn();
-            self::assertEquals(0, $count);
+            self::assertSame(0, \PHP_VERSION_ID < 8_10_00 ? (int) $count : $count);
 
             $pdo->exec('INSERT INTO testExceptionRollsback VALUES(1)');
 
@@ -134,7 +136,7 @@ public function testReplayTransaction(\Exception $exception): void
         });
 
         $count = $pdo->query('SELECT count(*) FROM testExceptionRollsback')->fetchColumn();
-        self::assertEquals(1, $count);
+        self::assertSame(1, \PHP_VERSION_ID < 8_10_00 ? (int) $count : $count);
 
         self::assertSame(5, $i);
     }
diff --git a/tests/util/DoubleCheckedLockingTest.php b/tests/util/DoubleCheckedLockingTest.php
index 3a9f6665..1386ef21 100644
--- a/tests/util/DoubleCheckedLockingTest.php
+++ b/tests/util/DoubleCheckedLockingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\util;
 
 use malkusch\lock\mutex\Mutex;
diff --git a/tests/util/LoopTest.php b/tests/util/LoopTest.php
index c2383df9..b548951e 100644
--- a/tests/util/LoopTest.php
+++ b/tests/util/LoopTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\util;
 
 use malkusch\lock\exception\TimeoutException;
diff --git a/tests/util/PcntlTimeoutTest.php b/tests/util/PcntlTimeoutTest.php
index a5aa3d0c..1f1eda52 100644
--- a/tests/util/PcntlTimeoutTest.php
+++ b/tests/util/PcntlTimeoutTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace malkusch\lock\Tests\util;
 
 use malkusch\lock\exception\DeadlineException;