diff --git a/composer.json b/composer.json
index 62feabd48..0d41b44c2 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-curl": "*",
-        "guzzlehttp/psr7": "^1.8.4|^2.1.1",
+        "guzzlehttp/psr7": "^1.8.4|^2.1.1|^3.0.0",
         "jean85/pretty-package-versions": "^1.5|^2.0.4",
         "psr/log": "^1.0|^2.0|^3.0",
         "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0|^8.0"
@@ -34,7 +34,8 @@
     "require-dev": {
         "carthage-software/mago": "1.30.0",
         "friendsofphp/php-cs-fixer": "^3.4",
-        "guzzlehttp/promises": "^2.0.3",
+        "guzzlehttp/guzzle": "^7.0|^8.0",
+        "guzzlehttp/promises": "^2.0.3|^3.0.0",
         "monolog/monolog": "^1.6|^2.0|^3.0",
         "nyholm/psr7": "^1.8",
         "open-telemetry/api": "^1.1",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 4a34c967f..121eab327 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -280,16 +280,6 @@ parameters:
 			count: 1
 			path: src/Serializer/AbstractSerializer.php
 
-		-
-			message: "#^Call to method getResponse\\(\\) on an unknown class GuzzleHttp\\\\Exception\\\\RequestException\\.$#"
-			count: 1
-			path: src/Tracing/GuzzleTracingMiddleware.php
-
-		-
-			message: "#^Class GuzzleHttp\\\\Exception\\\\RequestException not found\\.$#"
-			count: 1
-			path: src/Tracing/GuzzleTracingMiddleware.php
-
 		-
 			message: "#^Property Sentry\\\\Tracing\\\\PropagationContext\\:\\:\\$parentSampled is never read, only written\\.$#"
 			count: 1
diff --git a/src/Tracing/GuzzleTracingMiddleware.php b/src/Tracing/GuzzleTracingMiddleware.php
index 8e277e4c0..480502c9c 100644
--- a/src/Tracing/GuzzleTracingMiddleware.php
+++ b/src/Tracing/GuzzleTracingMiddleware.php
@@ -87,7 +87,7 @@ public static function trace(?HubInterface $hub = null): \Closure
 
                     if ($responseOrException instanceof ResponseInterface) {
                         $response = $responseOrException;
-                    } elseif ($responseOrException instanceof GuzzleRequestException) {
+                    } elseif ($responseOrException instanceof GuzzleRequestException && method_exists($responseOrException, 'getResponse')) {
                         $response = $responseOrException->getResponse();
                     }
 
diff --git a/tests/Integration/RequestIntegrationTest.php b/tests/Integration/RequestIntegrationTest.php
index e53a432ac..11de6825b 100644
--- a/tests/Integration/RequestIntegrationTest.php
+++ b/tests/Integration/RequestIntegrationTest.php
@@ -273,7 +273,7 @@ public static function invokeDataProvider(): iterable
                 'max_request_body_size' => 'small',
             ],
             (new ServerRequest('POST', 'http://www.example.com/foo'))
-                ->withHeader('Content-Length', 10 ** 3)
+                ->withHeader('Content-Length', (string) (10 ** 3))
                 ->withBody(Utils::streamFor('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at placerat est. Donec maximus odio augue, vitae bibendum nisi euismod nec. Nunc vel velit ligula. Ut non ultricies magna, non condimentum turpis. Donec pellentesque id nunc at facilisis. Sed fermentum ultricies nunc, id posuere ex ullamcorper quis. Sed varius tincidunt nulla, id varius nulla interdum sit amet. Pellentesque molestie sapien at mi tristique consequat. Nullam id eleifend arcu. Vivamus sed placerat neque. Ut sapien magna, elementum in euismod pretium, rhoncus vitae augue. Nam ullamcorper dui et tortor semper, eu feugiat elit faucibus. Curabitur vel auctor odio. Phasellus vestibulum ullamcorper dictum. Suspendisse fringilla, ipsum bibendum venenatis vulputate, nunc orci facilisis leo, commodo finibus mi arcu in turpis. Mauris ut ultrices est. Nam quis purus ut nulla interdum ornare. Proin in tellus egestas, commodo magna porta, consequat justo. Vivamus in convallis odio. Pellentesque porttitor, urna non gravida.')),
             [
                 'url' => 'http://www.example.com/foo',