diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py
index cc20470d68..ed2553a42f 100644
--- a/pavelib/utils/envs.py
+++ b/pavelib/utils/envs.py
@@ -77,8 +77,8 @@ class Env:
     PRINT_SETTINGS_LOG_FILE = GEN_LOG_DIR / "print_settings.log"
 
     # Detect if in a Docker container, and if so which one
-    SERVER_HOST = os.environ.get('SERVER_HOSTNAME', '0.0.0.0')
-    USING_DOCKER = SERVER_HOST != '0.0.0.0'
+    FRONTEND_TEST_SERVER_HOST = os.environ.get('FRONTEND_TEST_SERVER_HOSTNAME', '0.0.0.0')
+    USING_DOCKER = FRONTEND_TEST_SERVER_HOST != '0.0.0.0'
     DEVSTACK_SETTINGS = 'devstack_docker' if USING_DOCKER else 'devstack'
     TEST_SETTINGS = 'test'
 
diff --git a/tox.ini b/tox.ini
index 0b8d8f967f..5000ca897b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,9 +26,9 @@ setenv =
     PYTHONHASHSEED=0
     TOXENV={envname}
 passenv =
-    SERVER_CMS_PORT
-    SERVER_HOSTNAME
-    SERVER_LMS_PORT
+    FRONTEND_TEST_CMS_PORT
+    FRONTEND_TEST_SERVER_HOSTNAME
+    FRONTEND_TEST_LMS_PORT
     DISABLE_COURSEENROLLMENT_HISTORY
     DISPLAY
     DJANGO_SETTINGS_MODULE