diff --git a/test/base/api_util.py b/test/base/api_util.py
index 6dbf12e2efe..a07c843e779 100644
--- a/test/base/api_util.py
+++ b/test/base/api_util.py
@@ -9,7 +9,11 @@ def get_master_api_key():
     configured as a master API key and should be able to create additional
     users and keys.
     """
-    return os.environ.get( "GALAXY_TEST_MASTER_API_KEY", DEFAULT_GALAXY_MASTER_API_KEY )
+    for key in ["GALAXY_CONFIG_MASTER_API_KEY", "GALAXY_CONFIG_OVERRIDE_MASTER_API_KEY"]:
+        value = os.environ.get(key, None)
+        if value:
+            return value
+    return DEFAULT_GALAXY_MASTER_API_KEY
 
 
 def get_user_api_key():