diff --git a/Demo/src/main/java/com/braintreepayments/demo/Settings.java b/Demo/src/main/java/com/braintreepayments/demo/Settings.java
index ed7d33fc28..569a954f25 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/Settings.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/Settings.java
@@ -14,10 +14,10 @@ public class Settings {
     static final String SANDBOX_ENV_NAME = "Sandbox";
     static final String PRODUCTION_ENV_NAME = "Production";
 
-    private static final String PRODUCTION_BASE_SERVER_URL = "https://executive-sample-merchant.herokuapp.com";
+    private static final String PRODUCTION_BASE_SERVER_URL = "https://braintree-production-merchant-455d21469113.herokuapp.com";
     private static final String PRODUCTION_TOKENIZATION_KEY = "production_t2wns2y2_dfy45jdj3dxkmz5m";
 
-    private static final String SANDBOX_BASE_SERVER_URL = "https://braintree-sample-merchant.herokuapp.com";
+    private static final String SANDBOX_BASE_SERVER_URL = "https://braintree-demo-merchant-63b7a2204f6e.herokuapp.com";
     private static final String SANDBOX_TOKENIZATION_KEY = "sandbox_tmxhyf7d_dcpspy2brwdjr3qn";
 
     static final String LOCAL_PAYMENTS_TOKENIZATION_KEY = "sandbox_f252zhq7_hh4cpc39zq4rgjcg";
diff --git a/TestUtils/src/main/java/com/braintreepayments/api/testutils/TestClientTokenBuilder.java b/TestUtils/src/main/java/com/braintreepayments/api/testutils/TestClientTokenBuilder.java
index f48a9376ad..f433af7cc2 100644
--- a/TestUtils/src/main/java/com/braintreepayments/api/testutils/TestClientTokenBuilder.java
+++ b/TestUtils/src/main/java/com/braintreepayments/api/testutils/TestClientTokenBuilder.java
@@ -54,9 +54,9 @@ private String fetchClientToken() {
 
             URL url;
             if (withCustomerId) {
-                url = new URL("https://braintree-sample-merchant.herokuapp.com/client_token?customer_id=" + UUID.randomUUID().toString());
+                url = new URL("https://braintree-demo-merchant-63b7a2204f6e.herokuapp.com/client_token?customer_id=" + UUID.randomUUID().toString());
             } else {
-                url = new URL("https://braintree-sample-merchant.herokuapp.com/client_token");
+                url = new URL("https://braintree-demo-merchant-63b7a2204f6e.herokuapp.com/client_token");
             }
 
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();