diff --git a/compatibility_lib/compatibility_lib/compatibility_checker.py b/compatibility_lib/compatibility_lib/compatibility_checker.py
index 8eb04722..980861ac 100644
--- a/compatibility_lib/compatibility_lib/compatibility_checker.py
+++ b/compatibility_lib/compatibility_lib/compatibility_checker.py
@@ -22,7 +22,7 @@
 
 from compatibility_lib import configs
 
-SERVER_URL = 'http://0.0.0.0:8888'
+SERVER_URL = 'http://104.197.8.72'
 
 PACKAGE_NOT_IN_WHITELIST = 'Request contains third party github head packages.'
 
diff --git a/compatibility_lib/compatibility_lib/test_compatibility_checker.py b/compatibility_lib/compatibility_lib/test_compatibility_checker.py
index 4a2ab37b..6c41de3a 100644
--- a/compatibility_lib/compatibility_lib/test_compatibility_checker.py
+++ b/compatibility_lib/compatibility_lib/test_compatibility_checker.py
@@ -28,6 +28,7 @@ def test_check(self):
 
         packages = 'test_pkg'
         python_version = 3
+        expected_server_url = 'http://104.197.8.72'
 
         data = {
             'python-version': python_version,
@@ -47,6 +48,8 @@ def test_check(self):
 
         mock_requests.get.assert_called_with(
             compatibility_checker.SERVER_URL, params=data)
+        self.assertEqual(compatibility_checker.SERVER_URL,
+                         expected_server_url)
 
     def _mock_retrying_check(self, *args):
         packages = args[0][0]
diff --git a/system_test/test_badge_server.py b/system_test/test_badge_server.py
index 970892de..35b4b40c 100644
--- a/system_test/test_badge_server.py
+++ b/system_test/test_badge_server.py
@@ -86,7 +86,7 @@ def test_google_compatibility_badge(self):
         content = response.content
 
         self.assertEqual(status_code, 200)
-        self.assertIn(b"CHECK WARNING", content)
+        self.assertIn(b"CALCULATING", content)
 
     @retry(wait_fixed=RETRY_WAIT_PERIOD,
            stop_max_attempt_number=RETRY_MAX_ATTEMPT)