diff --git a/src/Requests/AbstractRequest.php b/src/Requests/AbstractRequest.php
index 84957c6..0683ac1 100644
--- a/src/Requests/AbstractRequest.php
+++ b/src/Requests/AbstractRequest.php
@@ -23,12 +23,12 @@ abstract class AbstractRequest extends CommonAbstractRequest
     /**
      * @var string
      */
-    protected $testServerEndpoint = 'https://secureshop-test.firstdata.lv:8443/ecomm/MerchantHandler';
+    protected $testServerEndpoint = 'https://securepaymentpage-test.baltic.worldline-solutions.com:8443/ecomm/MerchantHandler'; //phpcs:ignore
 
     /**
      * @var string
      */
-    protected $liveServerEndpoint = 'https://secureshop.firstdata.lv:8443/ecomm/MerchantHandler';
+    protected $liveServerEndpoint = 'https://securepaymentpage.baltic.worldline-solutions.com:8443/ecomm/MerchantHandler'; //phpcs:ignore
 
 
     /**
diff --git a/src/Responses/AbstractResponse.php b/src/Responses/AbstractResponse.php
index d825e31..6f0144e 100644
--- a/src/Responses/AbstractResponse.php
+++ b/src/Responses/AbstractResponse.php
@@ -28,12 +28,12 @@ abstract class AbstractResponse extends CommonAbstractResponse
     /**
      * @var string
      */
-    protected $testClientEndpoint = 'https://secureshop-test.firstdata.lv/ecomm/ClientHandler';
+    protected $testClientEndpoint = 'https://securepaymentpage-test.baltic.worldline-solutions.com/ecomm/ClientHandler';
 
     /**
      * @var string
      */
-    protected $liveClientEndpoint = 'https://secureshop.firstdata.lv/ecomm/ClientHandler';
+    protected $liveClientEndpoint = 'https://securepaymentpage.baltic.worldline-solutions.com/ecomm/ClientHandler';
 
     /**
      * @var bool
diff --git a/tests/GatewayTest.php b/tests/GatewayTest.php
index 778103b..cdca15b 100644
--- a/tests/GatewayTest.php
+++ b/tests/GatewayTest.php
@@ -136,7 +136,7 @@ public function testPurchaseSuccess()
         $this->assertEquals(array(), $response->getRedirectData());
         $this->assertEquals('0AmRNR/ntNUZpeTkHSCGVw1wivc=', $response->getTransactionReference());
         $this->assertEquals('GET', $response->getRedirectMethod());
-        $this->assertEquals('https://secureshop-test.firstdata.lv/ecomm/ClientHandler?trans_id=0AmRNR%2FntNUZpeTkHSCGVw1wivc%3D', $response->getRedirectUrl());
+        $this->assertEquals('https://securepaymentpage-test.baltic.worldline-solutions.com/ecomm/ClientHandler?trans_id=0AmRNR%2FntNUZpeTkHSCGVw1wivc%3D', $response->getRedirectUrl());
     }
 
     public function testPurchaseFailed()
@@ -291,7 +291,7 @@ public function testAuthorize()
         $this->assertEquals(array(), $response->getRedirectData());
         $this->assertEquals('BBmRNR/ntNUZpeTkHSCGVw1wivc=', $response->getTransactionReference());
         $this->assertEquals('GET', $response->getRedirectMethod());
-        $this->assertEquals('https://secureshop-test.firstdata.lv/ecomm/ClientHandler?trans_id=BBmRNR%2FntNUZpeTkHSCGVw1wivc%3D', $response->getRedirectUrl());
+        $this->assertEquals('https://securepaymentpage-test.baltic.worldline-solutions.com/ecomm/ClientHandler?trans_id=BBmRNR%2FntNUZpeTkHSCGVw1wivc%3D', $response->getRedirectUrl());
     }
 
     public function testAuthorizeFailed()
diff --git a/tests/Messages/AbstractRequestTest.php b/tests/Messages/AbstractRequestTest.php
index a39b891..01e62ef 100644
--- a/tests/Messages/AbstractRequestTest.php
+++ b/tests/Messages/AbstractRequestTest.php
@@ -69,7 +69,7 @@ public function testSendData()
 
         // test actual headers we are sending
         $headers = array(
-            'Host' => ['secureshop.firstdata.lv:8443'],
+            'Host' => ['securepaymentpage.baltic.worldline-solutions.com:8443'],
             'Content-Type' => ['application/x-www-form-urlencoded']
         );
         $this->assertSame($headers, $httpRequest->getHeaders());