diff --git a/src/test/java/com/adyen/BalanceControlTest.java b/src/test/java/com/adyen/BalanceControlTest.java
index d1d201c3d..f25769630 100644
--- a/src/test/java/com/adyen/BalanceControlTest.java
+++ b/src/test/java/com/adyen/BalanceControlTest.java
@@ -31,7 +31,11 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = BalanceControlApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(balanceControlApi);
-    assertEquals("https://pal-test.adyen.com/pal/servlet/BalanceControl/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://pal-test.adyen.com/pal/servlet/BalanceControl/v%s",
+            BalanceControlApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -49,7 +53,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(balanceControlApi);
     assertEquals(
-        "https://myCompany-pal-live.adyenpayments.com/pal/servlet/BalanceControl/v1", baseURL);
+        String.format(
+            "https://myCompany-pal-live.adyenpayments.com/pal/servlet/BalanceControl/v%s",
+            BalanceControlApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -60,7 +67,9 @@ public void TestBalanceControlApi() throws IOException, ApiException, HTTPClient
 
     verify(client.getHttpClient())
         .request(
-            "https://pal-test.adyen.com/pal/servlet/BalanceControl/v1/balanceTransfer",
+            String.format(
+                "https://pal-test.adyen.com/pal/servlet/BalanceControl/v%s/balanceTransfer",
+                BalanceControlApi.API_VERSION),
             "{}",
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/BalancePlatformTest.java b/src/test/java/com/adyen/BalancePlatformTest.java
index a9be568f3..eda93bc04 100644
--- a/src/test/java/com/adyen/BalancePlatformTest.java
+++ b/src/test/java/com/adyen/BalancePlatformTest.java
@@ -31,7 +31,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PlatformApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(platformApi);
-    assertEquals("https://balanceplatform-api-test.adyen.com/bcl/v2", baseURL);
+    assertEquals(
+        String.format(
+            "https://balanceplatform-api-test.adyen.com/bcl/v%s", PlatformApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -43,7 +46,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PlatformApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(platformApi);
-    assertEquals("https://balanceplatform-api-live.adyen.com/bcl/v2", baseURL);
+    assertEquals(
+        String.format(
+            "https://balanceplatform-api-live.adyen.com/bcl/v%s", PlatformApi.API_VERSION),
+        baseURL);
   }
 
   @Test
diff --git a/src/test/java/com/adyen/BinLookupTest.java b/src/test/java/com/adyen/BinLookupTest.java
index 4e5372a85..d665ff9f5 100644
--- a/src/test/java/com/adyen/BinLookupTest.java
+++ b/src/test/java/com/adyen/BinLookupTest.java
@@ -49,7 +49,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = BinLookupApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(binLookupApi);
-    assertEquals("https://pal-test.adyen.com/pal/servlet/BinLookup/v54", baseURL);
+    assertEquals(
+        String.format(
+            "https://pal-test.adyen.com/pal/servlet/BinLookup/v%s", BinLookupApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -66,7 +69,11 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = BinLookupApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(binLookupApi);
-    assertEquals("https://myCompany-pal-live.adyenpayments.com/pal/servlet/BinLookup/v54", baseURL);
+    assertEquals(
+        String.format(
+            "https://myCompany-pal-live.adyenpayments.com/pal/servlet/BinLookup/v%s",
+            BinLookupApi.API_VERSION),
+        baseURL);
   }
 
   @Test
diff --git a/src/test/java/com/adyen/CheckoutTest.java b/src/test/java/com/adyen/CheckoutTest.java
index e59b04a24..65f9571e5 100644
--- a/src/test/java/com/adyen/CheckoutTest.java
+++ b/src/test/java/com/adyen/CheckoutTest.java
@@ -53,7 +53,8 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentsApi);
-    assertEquals("https://checkout-test.adyen.com/v71", baseURL);
+    assertEquals(
+        String.format("https://checkout-test.adyen.com/v%s", PaymentsApi.API_VERSION), baseURL);
   }
 
   @Test
@@ -70,7 +71,11 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentsApi);
-    assertEquals("https://myCompany-checkout-live.adyenpayments.com/checkout/v71", baseURL);
+    assertEquals(
+        String.format(
+            "https://myCompany-checkout-live.adyenpayments.com/checkout/v%s",
+            PaymentsApi.API_VERSION),
+        baseURL);
   }
 
   /** Should make a payment */
@@ -450,7 +455,9 @@ public void testLiveURLCheckout() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://prefix-checkout-live.adyenpayments.com/checkout/v71/storedPaymentMethods/recurringId",
+            String.format(
+                "https://prefix-checkout-live.adyenpayments.com/checkout/v%s/storedPaymentMethods/recurringId",
+                RecurringApi.API_VERSION),
             null,
             client.getConfig(),
             false,
@@ -472,7 +479,9 @@ public void testLiveURLCheckoutWithSetEnviroment() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://prefix-checkout-live.adyenpayments.com/checkout/v71/storedPaymentMethods/recurringId",
+            String.format(
+                "https://prefix-checkout-live.adyenpayments.com/checkout/v%s/storedPaymentMethods/recurringId",
+                RecurringApi.API_VERSION),
             null,
             client.getConfig(),
             false,
@@ -575,7 +584,7 @@ public void testPaymentWithRatepay() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://checkout-test.adyen.com/v71/payments",
+            String.format("https://checkout-test.adyen.com/v%s/payments", PaymentsApi.API_VERSION),
             paymentRequest.toJson(),
             client.getConfig(),
             false,
@@ -648,7 +657,7 @@ public void testPaymentWithRiverty() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://checkout-test.adyen.com/v71/payments",
+            String.format("https://checkout-test.adyen.com/v%s/payments", PaymentsApi.API_VERSION),
             paymentRequest.toJson(),
             client.getConfig(),
             false,
@@ -694,7 +703,9 @@ public void testSessionsCheckDefaultValues() throws Exception {
     final ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
     verify(client.getHttpClient())
         .request(
-            eq("https://checkout-test.adyen.com/v71/sessions"),
+            eq(
+                String.format(
+                    "https://checkout-test.adyen.com/v%s/sessions", PaymentsApi.API_VERSION)),
             captor.capture(),
             any(com.adyen.Config.class),
             eq(false),
@@ -808,7 +819,9 @@ public void testPaymentWithIdempotencyKey() throws Exception {
     ArgumentCaptor<RequestOptions> optionsCaptor = ArgumentCaptor.forClass(RequestOptions.class);
     verify(client.getHttpClient())
         .request(
-            eq("https://checkout-test.adyen.com/v71/payments"),
+            eq(
+                String.format(
+                    "https://checkout-test.adyen.com/v%s/payments", PaymentsApi.API_VERSION)),
             isNotNull(),
             eq(client.getConfig()),
             eq(false),
diff --git a/src/test/java/com/adyen/DataProtectionServiceTest.java b/src/test/java/com/adyen/DataProtectionServiceTest.java
index fa75a10df..3e5304423 100644
--- a/src/test/java/com/adyen/DataProtectionServiceTest.java
+++ b/src/test/java/com/adyen/DataProtectionServiceTest.java
@@ -44,7 +44,11 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = DataProtectionApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(dataProtectionApi);
-    assertEquals("https://ca-test.adyen.com/ca/services/DataProtectionService/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://ca-test.adyen.com/ca/services/DataProtectionService/v%s",
+            DataProtectionApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -56,7 +60,11 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = DataProtectionApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(dataProtectionApi);
-    assertEquals("https://ca-live.adyen.com/ca/services/DataProtectionService/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://ca-live.adyen.com/ca/services/DataProtectionService/v%s",
+            DataProtectionApi.API_VERSION),
+        baseURL);
   }
 
   /** Test success flow for POST /requestSubjectErasure */
@@ -72,7 +80,9 @@ public void TestRequestSubjectErasureSuccessMocked() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DataProtectionService/v1/requestSubjectErasure",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DataProtectionService/v%s/requestSubjectErasure",
+                DataProtectionApi.API_VERSION),
             "{}",
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/DisputesTest.java b/src/test/java/com/adyen/DisputesTest.java
index b211c481d..7a8208d4a 100644
--- a/src/test/java/com/adyen/DisputesTest.java
+++ b/src/test/java/com/adyen/DisputesTest.java
@@ -25,7 +25,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = DisputesApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(disputesApi);
-    assertEquals("https://ca-test.adyen.com/ca/services/DisputeService/v30", baseURL);
+    assertEquals(
+        String.format(
+            "https://ca-test.adyen.com/ca/services/DisputeService/v%s", DisputesApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -37,7 +40,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = DisputesApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(disputesApi);
-    assertEquals("https://ca-live.adyen.com/ca/services/DisputeService/v30", baseURL);
+    assertEquals(
+        String.format(
+            "https://ca-live.adyen.com/ca/services/DisputeService/v%s", DisputesApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -54,9 +60,9 @@ public void acceptDispute() throws IOException, ApiException, HTTPClientExceptio
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DisputeService/v"
-                + DisputesApi.API_VERSION
-                + "/acceptDispute",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DisputeService/v%s/acceptDispute",
+                DisputesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
@@ -82,9 +88,9 @@ public void defendDispute() throws IOException, ApiException, HTTPClientExceptio
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DisputeService/v"
-                + DisputesApi.API_VERSION
-                + "/defendDispute",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DisputeService/v%s/defendDispute",
+                DisputesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
@@ -112,9 +118,9 @@ public void deleteDisputeDefenseDocument() throws IOException, ApiException, HTT
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DisputeService/v"
-                + DisputesApi.API_VERSION
-                + "/deleteDisputeDefenseDocument",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DisputeService/v%s/deleteDisputeDefenseDocument",
+                DisputesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
@@ -141,9 +147,9 @@ public void retrieveApplicableDefenseReasons()
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DisputeService/v"
-                + DisputesApi.API_VERSION
-                + "/retrieveApplicableDefenseReasons",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DisputeService/v%s/retrieveApplicableDefenseReasons",
+                DisputesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
@@ -211,9 +217,9 @@ public void supplyDefenseDocument() throws IOException, ApiException, HTTPClient
 
     verify(client.getHttpClient())
         .request(
-            "https://ca-test.adyen.com/ca/services/DisputeService/v"
-                + DisputesApi.API_VERSION
-                + "/supplyDefenseDocument",
+            String.format(
+                "https://ca-test.adyen.com/ca/services/DisputeService/v%s/supplyDefenseDocument",
+                DisputesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/LegalEntityManagementTest.java b/src/test/java/com/adyen/LegalEntityManagementTest.java
index a0af987b7..85855ac7d 100644
--- a/src/test/java/com/adyen/LegalEntityManagementTest.java
+++ b/src/test/java/com/adyen/LegalEntityManagementTest.java
@@ -28,7 +28,8 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = LegalEntitiesApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(legalEntitiesApi);
-    assertEquals("https://kyc-test.adyen.com/lem/v4", baseURL);
+    assertEquals(
+        String.format("https://kyc-test.adyen.com/lem/v%s", LegalEntitiesApi.API_VERSION), baseURL);
   }
 
   @Test
@@ -40,7 +41,8 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = LegalEntitiesApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(legalEntitiesApi);
-    assertEquals("https://kyc-live.adyen.com/lem/v4", baseURL);
+    assertEquals(
+        String.format("https://kyc-live.adyen.com/lem/v%s", LegalEntitiesApi.API_VERSION), baseURL);
   }
 
   @Test
@@ -277,7 +279,9 @@ public void BusinessLinesUpdateTest() throws Exception {
     assertEquals("string", response.getId());
     verify(client.getHttpClient())
         .request(
-            "https://kyc-test.adyen.com/lem/v4/businessLines/SE322KT223222D5FJ7TJN2986",
+            String.format(
+                "https://kyc-test.adyen.com/lem/v%s/businessLines/SE322KT223222D5FJ7TJN2986",
+                BusinessLinesApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
@@ -388,7 +392,9 @@ public void DocumentsDeleteTest() throws Exception {
     service.deleteDocument("SE322KT223222D5FJ7TJN2986");
     verify(client.getHttpClient())
         .request(
-            "https://kyc-test.adyen.com/lem/v4/documents/SE322KT223222D5FJ7TJN2986",
+            String.format(
+                "https://kyc-test.adyen.com/lem/v%s/documents/SE322KT223222D5FJ7TJN2986",
+                DocumentsApi.API_VERSION),
             null,
             client.getConfig(),
             false,
@@ -428,7 +434,9 @@ public void HostedOnboardingPageRetrieveThemesTest() throws Exception {
     assertEquals("SE322KT223222D5FJ7TJN2986", response.getId());
     verify(client.getHttpClient())
         .request(
-            "https://kyc-test.adyen.com/lem/v4/themes/SE322KT223222D5FJ7TJN2986",
+            String.format(
+                "https://kyc-test.adyen.com/lem/v%s/themes/SE322KT223222D5FJ7TJN2986",
+                HostedOnboardingApi.API_VERSION),
             null,
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/ManagementTest.java b/src/test/java/com/adyen/ManagementTest.java
index ed69ad013..5ac7bd199 100644
--- a/src/test/java/com/adyen/ManagementTest.java
+++ b/src/test/java/com/adyen/ManagementTest.java
@@ -27,7 +27,9 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = AccountMerchantLevelApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(accountMerchantLevelApi);
-    assertEquals("https://management-test.adyen.com/v3", baseURL);
+    assertEquals(
+        String.format("https://management-test.adyen.com/v%s", AccountMerchantLevelApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -39,7 +41,9 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = AccountMerchantLevelApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(accountMerchantLevelApi);
-    assertEquals("https://management-live.adyen.com/v3", baseURL);
+    assertEquals(
+        String.format("https://management-live.adyen.com/v%s", AccountMerchantLevelApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -65,7 +69,9 @@ public void listMerchantAccountsPaginated()
 
     verify(client.getHttpClient())
         .request(
-            "https://management-test.adyen.com/v3/merchants",
+            String.format(
+                "https://management-test.adyen.com/v%s/merchants",
+                AccountMerchantLevelApi.API_VERSION),
             null,
             client.getConfig(),
             false,
@@ -99,7 +105,9 @@ public void updateTerminalSettings() throws IOException, ApiException, HTTPClien
     assertTrue(response.getReceiptPrinting().getShopperApproved());
     verify(client.getHttpClient())
         .request(
-            "https://management-test.adyen.com/v3/terminals/123ABC/terminalSettings",
+            String.format(
+                "https://management-test.adyen.com/v%s/terminals/123ABC/terminalSettings",
+                TerminalSettingsTerminalLevelApi.API_VERSION),
             "{\"receiptPrinting\":{\"shopperApproved\":true}}",
             client.getConfig(),
             false,
@@ -120,7 +128,9 @@ public void createStore() throws IOException, ApiException, HTTPClientException
     assertEquals("YOUR_STORE_ID", store.getId());
     verify(client.getHttpClient())
         .request(
-            "https://management-test.adyen.com/v3/merchants/YOUR_MERCHANT_ACCOUNT_ID/stores",
+            String.format(
+                "https://management-test.adyen.com/v%s/merchants/YOUR_MERCHANT_ACCOUNT_ID/stores",
+                AccountStoreLevelApi.API_VERSION),
             "{\"description\":\"City centre store\"}",
             client.getConfig(),
             false,
@@ -138,7 +148,9 @@ public void removeAllowedOrigin() throws IOException, ApiException, HTTPClientEx
 
     verify(client.getHttpClient())
         .request(
-            "https://management-test.adyen.com/v3/me/allowedOrigins/ID",
+            String.format(
+                "https://management-test.adyen.com/v%s/me/allowedOrigins/ID",
+                MyApiCredentialApi.API_VERSION),
             null,
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/OpenBankingTest.java b/src/test/java/com/adyen/OpenBankingTest.java
index 08d11973b..ea20c6843 100644
--- a/src/test/java/com/adyen/OpenBankingTest.java
+++ b/src/test/java/com/adyen/OpenBankingTest.java
@@ -27,7 +27,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = AccountVerificationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(accountVerificationApi);
-    assertEquals("https://obgateway-test.adyen.com/obgateway/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://obgateway-test.adyen.com/obgateway/v%s", AccountVerificationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -39,7 +42,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = AccountVerificationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(accountVerificationApi);
-    assertEquals("https://obgateway-live.adyen.com/obgateway/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://obgateway-live.adyen.com/obgateway/v%s", AccountVerificationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -65,7 +71,10 @@ public void createAccountVerificationRoutesTest() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            eq("https://obgateway-test.adyen.com/obgateway/v1/accountVerification/routes"),
+            eq(
+                String.format(
+                    "https://obgateway-test.adyen.com/obgateway/v%s/accountVerification/routes",
+                    AccountVerificationApi.API_VERSION)),
             anyString(),
             eq(client.getConfig()),
             eq(false),
@@ -90,7 +99,10 @@ public void getAccountVerificationReportTest() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            eq("https://obgateway-test.adyen.com/obgateway/v1/accountVerification/reports/" + code),
+            eq(
+                String.format(
+                    "https://obgateway-test.adyen.com/obgateway/v%s/accountVerification/reports/%s",
+                    AccountVerificationApi.API_VERSION, code)),
             eq(null),
             eq(client.getConfig()),
             eq(false),
diff --git a/src/test/java/com/adyen/PaymentTest.java b/src/test/java/com/adyen/PaymentTest.java
index 367e9d2ec..5c0ff7ac0 100644
--- a/src/test/java/com/adyen/PaymentTest.java
+++ b/src/test/java/com/adyen/PaymentTest.java
@@ -68,7 +68,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentApi);
-    assertEquals("https://pal-test.adyen.com/pal/servlet/Payment/v68", baseURL);
+    assertEquals(
+        String.format(
+            "https://pal-test.adyen.com/pal/servlet/Payment/v%s", PaymentsApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -85,7 +88,11 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentApi);
-    assertEquals("https://myCompany-pal-live.adyenpayments.com/pal/servlet/Payment/v68", baseURL);
+    assertEquals(
+        String.format(
+            "https://myCompany-pal-live.adyenpayments.com/pal/servlet/Payment/v%s",
+            PaymentsApi.API_VERSION),
+        baseURL);
   }
 
   /** Test success flow for POST /authorise */
diff --git a/src/test/java/com/adyen/PaymentsAppTest.java b/src/test/java/com/adyen/PaymentsAppTest.java
index b31cdacb8..5d6c61fe1 100644
--- a/src/test/java/com/adyen/PaymentsAppTest.java
+++ b/src/test/java/com/adyen/PaymentsAppTest.java
@@ -26,7 +26,9 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsAppApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentsAppApi);
-    assertEquals("https://management-test.adyen.com/v1", baseURL);
+    assertEquals(
+        String.format("https://management-test.adyen.com/v%s", PaymentsAppApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -38,7 +40,9 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = PaymentsAppApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(paymentsAppApi);
-    assertEquals("https://management-live.adyen.com/v1", baseURL);
+    assertEquals(
+        String.format("https://management-live.adyen.com/v%s", PaymentsAppApi.API_VERSION),
+        baseURL);
   }
 
   @Test
diff --git a/src/test/java/com/adyen/PayoutTest.java b/src/test/java/com/adyen/PayoutTest.java
index 0aa20a846..275abbf7d 100644
--- a/src/test/java/com/adyen/PayoutTest.java
+++ b/src/test/java/com/adyen/PayoutTest.java
@@ -52,7 +52,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = InitializationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(initializationApi);
-    assertEquals("https://pal-test.adyen.com/pal/servlet/Payout/v68", baseURL);
+    assertEquals(
+        String.format(
+            "https://pal-test.adyen.com/pal/servlet/Payout/v%s", InitializationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -69,7 +72,11 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = InitializationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(initializationApi);
-    assertEquals("https://myCompany-pal-live.adyenpayments.com/pal/servlet/Payout/v68", baseURL);
+    assertEquals(
+        String.format(
+            "https://myCompany-pal-live.adyenpayments.com/pal/servlet/Payout/v%s",
+            InitializationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
diff --git a/src/test/java/com/adyen/RecurringTest.java b/src/test/java/com/adyen/RecurringTest.java
index 2cec6fe98..678fabf13 100644
--- a/src/test/java/com/adyen/RecurringTest.java
+++ b/src/test/java/com/adyen/RecurringTest.java
@@ -98,7 +98,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(recurring);
     assertEquals(
-        "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68", baseURL);
+        String.format(
+            "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v%s",
+            RecurringApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -116,7 +119,9 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(recurring);
     assertEquals(
-        "https://myCompany-paltokenization-live.adyenpayments.com/paltokenization/servlet/Recurring/v68",
+        String.format(
+            "https://myCompany-paltokenization-live.adyenpayments.com/paltokenization/servlet/Recurring/v%s",
+            RecurringApi.API_VERSION),
         baseURL);
   }
 
@@ -141,7 +146,9 @@ public void testListRecurringDetails() throws Exception {
     verify(client.getHttpClient())
         .request(
             eq(
-                "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68/listRecurringDetails"),
+                String.format(
+                    "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v%s/listRecurringDetails",
+                    RecurringApi.API_VERSION)),
             requestBodyCaptor.capture(),
             eq(client.getConfig()),
             eq(false),
diff --git a/src/test/java/com/adyen/SessionAuthenticationTest.java b/src/test/java/com/adyen/SessionAuthenticationTest.java
index a796d9bd4..a713c513d 100644
--- a/src/test/java/com/adyen/SessionAuthenticationTest.java
+++ b/src/test/java/com/adyen/SessionAuthenticationTest.java
@@ -22,7 +22,9 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = SessionAuthenticationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(sessionAuthenticationApi);
-    assertEquals("https://test.adyen.com/authe/api/v1", baseURL);
+    assertEquals(
+        String.format("https://test.adyen.com/authe/api/v%s", SessionAuthenticationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -34,7 +36,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = SessionAuthenticationApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(sessionAuthenticationApi);
-    assertEquals("https://authe-live.adyen.com/authe/api/v1", baseURL);
+    assertEquals(
+        String.format(
+            "https://authe-live.adyen.com/authe/api/v%s", SessionAuthenticationApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -63,7 +68,9 @@ public void createAuthenticationSessionTest() throws Exception {
 
     verify(client.getHttpClient())
         .request(
-            "https://test.adyen.com/authe/api/v1/sessions",
+            String.format(
+                "https://test.adyen.com/authe/api/v%s/sessions",
+                SessionAuthenticationApi.API_VERSION),
             request.toJson(),
             client.getConfig(),
             false,
diff --git a/src/test/java/com/adyen/TransfersTest.java b/src/test/java/com/adyen/TransfersTest.java
index 411666f54..e40ba458e 100644
--- a/src/test/java/com/adyen/TransfersTest.java
+++ b/src/test/java/com/adyen/TransfersTest.java
@@ -22,7 +22,10 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = TransfersApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(transfersApi);
-    assertEquals("https://balanceplatform-api-test.adyen.com/btl/v4", baseURL);
+    assertEquals(
+        String.format(
+            "https://balanceplatform-api-test.adyen.com/btl/v%s", TransfersApi.API_VERSION),
+        baseURL);
   }
 
   @Test
@@ -34,7 +37,10 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
     Field baseURLField = TransfersApi.class.getDeclaredField("baseURL");
     baseURLField.setAccessible(true);
     String baseURL = (String) baseURLField.get(transfersApi);
-    assertEquals("https://balanceplatform-api-live.adyen.com/btl/v4", baseURL);
+    assertEquals(
+        String.format(
+            "https://balanceplatform-api-live.adyen.com/btl/v%s", TransfersApi.API_VERSION),
+        baseURL);
   }
 
   @Test