diff --git a/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs b/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs
index 8da940b7..a9dcc103 100644
--- a/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs
+++ b/dotnet/Vaas/test/Vaas.Test/IntegrationTests.cs
@@ -174,10 +174,10 @@ public async Task ForUrl_WithUrlWithStatusCode4xx_ThrowsVaasClientException()
     {
         var vaas = await AuthenticateWithCredentials();
         var e = await Assert.ThrowsAsync<VaasClientException>(() =>
-            vaas.ForUrlAsync(new Uri("https://upload.production.vaas.gdatasecurity.de/nocontenthere"),
+            vaas.ForUrlAsync(new Uri("https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere"),
                 CancellationToken.None));
         Assert.Equal(
-            "Call failed with status code 404 (Not Found): GET https://upload.production.vaas.gdatasecurity.de/nocontenthere",
+            "Call failed with status code 404 (Not Found): GET https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere",
             e.Message);
     }
 
diff --git a/php/tests/vaas/VaasTest.php b/php/tests/vaas/VaasTest.php
index 814b5386..3b946051 100644
--- a/php/tests/vaas/VaasTest.php
+++ b/php/tests/vaas/VaasTest.php
@@ -513,10 +513,10 @@ public function testForUrl_WithStatus4xx_ThrowsVaasClientException()
     {
         $vaas = $this->_getVaas();
         $this->expectException(VaasClientException::class);
-        $this->expectExceptionMessage("Call failed with status code 404 (Not Found): GET https://upload.production.vaas.gdatasecurity.de/nocontenthere");
+        $this->expectExceptionMessage("Call failed with status code 404 (Not Found): GET https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere");
         $vaas->Connect($this->getClientCredentialsGrantAuthenticator()->getToken());
 
-        $invalidUrl = "https://upload.production.vaas.gdatasecurity.de/nocontenthere";
+        $invalidUrl = "https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere";
         $verdict = $vaas->ForUrl($invalidUrl);
         $this->_getDebugLogger()->info("Verdict for URL " . $invalidUrl . " is " . $verdict->Verdict);
     }
diff --git a/python/tests/test_vaas.py b/python/tests/test_vaas.py
index e52fa716..0e257fcf 100644
--- a/python/tests/test_vaas.py
+++ b/python/tests/test_vaas.py
@@ -214,9 +214,9 @@ async def test_for_url_without_cache_returns_clean_for_robots_txt(self):
     async def test_for_url__with_url_with_status_code_4xx__raises_VaasClientError(self):
         options = get_disabled_options()
         async with await create_and_connect(options=options) as vaas:
-            with self.assertRaises(VaasClientError, msg="Call failed with status code 404 (Not Found): GET https://upload.production.vaas.gdatasecurity.de/nocontenthere") as error:
-                await vaas.for_url("https://upload.production.vaas.gdatasecurity.de/nocontenthere")
-            self.assertEqual(str(error.msg), "Call failed with status code 404 (Not Found): GET https://upload.production.vaas.gdatasecurity.de/nocontenthere")
+            with self.assertRaises(VaasClientError, msg="Call failed with status code 404 (Not Found): GET https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere") as error:
+                await vaas.for_url("https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere")
+            self.assertEqual(str(error.msg), "Call failed with status code 404 (Not Found): GET https://gateway.production.vaas.gdatasecurity.de/swagger/nocontenthere")
 
     async def test_for_buffer_traces(self):
         tracing = VaasTracing()