diff --git a/tests/Feature/BeberleiExtensionsServiceProviderTest.php b/tests/Feature/BeberleiExtensionsServiceProviderTest.php
index 0aa9209..3c57747 100644
--- a/tests/Feature/BeberleiExtensionsServiceProviderTest.php
+++ b/tests/Feature/BeberleiExtensionsServiceProviderTest.php
@@ -6,6 +6,8 @@
 
 use LaravelDoctrine\ORM\DoctrineManager;
 
+use function app;
+
 class BeberleiExtensionsServiceProviderTest extends TestCase
 {
     public function testCustomFunctionsCanBeRegistered(): void
diff --git a/tests/Feature/GedmoExtensionsServiceProviderAllMappingsTest.php b/tests/Feature/GedmoExtensionsServiceProviderAllMappingsTest.php
index 1171abd..c303028 100644
--- a/tests/Feature/GedmoExtensionsServiceProviderAllMappingsTest.php
+++ b/tests/Feature/GedmoExtensionsServiceProviderAllMappingsTest.php
@@ -5,15 +5,15 @@
 namespace LaravelDoctrineTest\Extensions\Feature;
 
 use Illuminate\Config\Repository;
-use LaravelDoctrine\ORM\DoctrineManager;
-use Illuminate\Events\Dispatcher;
+
+use function tap;
 
 class GedmoExtensionsServiceProviderAllMappingsTest extends TestCase
 {
-    protected function defineEnvironment($app)
+    protected function defineEnvironment(mixed $app): void
     {
         // Setup default database to use sqlite :memory:
-        tap($app['config'], function (Repository $config) {
+        tap($app['config'], static function (Repository $config): void {
             $config->set('doctrine.gedmo.all_mappings', true);
         });
     }
diff --git a/tests/Feature/GedmoExtensionsServiceProviderTest.php b/tests/Feature/GedmoExtensionsServiceProviderTest.php
index 092b49d..65c4423 100644
--- a/tests/Feature/GedmoExtensionsServiceProviderTest.php
+++ b/tests/Feature/GedmoExtensionsServiceProviderTest.php
@@ -4,9 +4,6 @@
 
 namespace LaravelDoctrineTest\Extensions\Feature;
 
-use LaravelDoctrine\ORM\DoctrineManager;
-use Illuminate\Events\Dispatcher;
-
 class GedmoExtensionsServiceProviderTest extends TestCase
 {
     public function testCustomExtensionsCanBeRegistered(): void