diff --git a/tests/EventListener/PsrResponseListenerTest.php b/tests/EventListener/PsrResponseListenerTest.php
index 8f2f7dd..46552d6 100644
--- a/tests/EventListener/PsrResponseListenerTest.php
+++ b/tests/EventListener/PsrResponseListenerTest.php
@@ -13,8 +13,8 @@
 namespace Ajgarlag\Bundle\PsrHttpMessageBundle\Tests\EventListener;
 
 use Ajgarlag\Bundle\PsrHttpMessageBundle\EventListener\PsrResponseListener;
+use Nyholm\Psr7\Response;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ViewEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
diff --git a/tests/Fixtures/config/config.php b/tests/Fixtures/config/config.php
index 1f8eb4f..19c0ab3 100644
--- a/tests/Fixtures/config/config.php
+++ b/tests/Fixtures/config/config.php
@@ -37,11 +37,15 @@
         ],
     ]);
 
+    $sensioFrameworkExtraConfig = [
+        'router' => ['annotations' => false],
+    ];
     if (class_exists(Psr7ServerRequestResolver::class)) {
-        $container->extension('sensio_framework_extra', [
+        $sensioFrameworkExtraConfig = array_merge($sensioFrameworkExtraConfig, [
             'psr_message' => ['enabled' => true],
         ]);
     }
+    $container->extension('sensio_framework_extra', $sensioFrameworkExtraConfig);
 
     $container->services()->set(ActionArgumentsController::class)->public();
     $container->services()->set('annotation_reader', AnnotationReader::class);