diff --git a/server/lib/python/cartodb_services/test/credentials.py b/server/lib/python/cartodb_services/test/credentials.py
index 1818f84..5f10182 100644
--- a/server/lib/python/cartodb_services/test/credentials.py
+++ b/server/lib/python/cartodb_services/test/credentials.py
@@ -1,6 +1,6 @@
 import os
 
-def api_key():
+def mapbox_api_key():
     """Returns Mapbox API key. Requires setting MAPBOX_API_KEY environment variable."""
     return os.environ['MAPBOX_API_KEY']
 
diff --git a/server/lib/python/cartodb_services/test/test_mapboxgeocoder.py b/server/lib/python/cartodb_services/test/test_mapboxgeocoder.py
index 286bcaa..84b5213 100644
--- a/server/lib/python/cartodb_services/test/test_mapboxgeocoder.py
+++ b/server/lib/python/cartodb_services/test/test_mapboxgeocoder.py
@@ -12,7 +12,7 @@ WELL_KNOWN_LATITUDE = 41.668654
 
 class MapboxGeocoderTestCase(unittest.TestCase):
     def setUp(self):
-        self.geocoder = MapboxGeocoder(token=credentials.api_key(), logger=Mock())
+        self.geocoder = MapboxGeocoder(token=credentials.mapbox_api_key(), logger=Mock())
 
     def test_invalid_token(self):
         invalid_geocoder = MapboxGeocoder(token=INVALID_TOKEN, logger=Mock())
diff --git a/server/lib/python/cartodb_services/test/test_mapboxisoline.py b/server/lib/python/cartodb_services/test/test_mapboxisoline.py
index 0c97a33..be44b3d 100644
--- a/server/lib/python/cartodb_services/test/test_mapboxisoline.py
+++ b/server/lib/python/cartodb_services/test/test_mapboxisoline.py
@@ -15,7 +15,7 @@ VALID_ORIGIN = Coordinate(-73.989, 40.733)
 class MapboxIsolinesTestCase(unittest.TestCase):
 
     def setUp(self):
-        matrix_client = MapboxMatrixClient(token=credentials.api_key(), logger=Mock())
+        matrix_client = MapboxMatrixClient(token=credentials.mapbox_api_key(), logger=Mock())
         self.mapbox_isolines = MapboxIsolines(matrix_client, logger=Mock())
 
     def test_calculate_isochrone(self):
diff --git a/server/lib/python/cartodb_services/test/test_mapboxmatrix.py b/server/lib/python/cartodb_services/test/test_mapboxmatrix.py
index 5bb5b4c..90cc3f2 100644
--- a/server/lib/python/cartodb_services/test/test_mapboxmatrix.py
+++ b/server/lib/python/cartodb_services/test/test_mapboxmatrix.py
@@ -22,7 +22,7 @@ INVALID_PROFILE = 'invalid_profile'
 
 class MapboxMatrixTestCase(unittest.TestCase):
     def setUp(self):
-        self.matrix_client = MapboxMatrixClient(token=credentials.api_key(),
+        self.matrix_client = MapboxMatrixClient(token=credentials.mapbox_api_key(),
                                                 logger=Mock())
 
     def test_invalid_profile(self):
diff --git a/server/lib/python/cartodb_services/test/test_mapboxrouting.py b/server/lib/python/cartodb_services/test/test_mapboxrouting.py
index 6fcbb49..8936bd8 100644
--- a/server/lib/python/cartodb_services/test/test_mapboxrouting.py
+++ b/server/lib/python/cartodb_services/test/test_mapboxrouting.py
@@ -31,7 +31,7 @@ WELL_KNOWN_LENGTH = 1317.9
 
 class MapboxRoutingTestCase(unittest.TestCase):
     def setUp(self):
-        self.routing = MapboxRouting(token=credentials.api_key(), logger=Mock())
+        self.routing = MapboxRouting(token=credentials.mapbox_api_key(), logger=Mock())
 
     def test_invalid_profile(self):
         with self.assertRaises(ValueError):