diff --git a/pavelib/paver_tests/test_utils.py b/pavelib/paver_tests/test_utils.py
index 7a157b04ea..ff468ecc9b 100644
--- a/pavelib/paver_tests/test_utils.py
+++ b/pavelib/paver_tests/test_utils.py
@@ -12,7 +12,6 @@ from pavelib.utils.envs import Env
 from pavelib.utils.test.utils import MINIMUM_FIREFOX_VERSION, check_firefox_version
 
 
-@unittest.skipIf(Env.USING_DOCKER, 'Firefox version check works differently under Docker Devstack')
 class TestUtils(unittest.TestCase):
     """
     Test utils.py under pavelib/utils/test
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
index a1b14c5445..f925fe1662 100644
--- a/pavelib/prereqs.py
+++ b/pavelib/prereqs.py
@@ -354,13 +354,3 @@ def install_prereqs():
 def log_installed_python_prereqs():
     """  Logs output of pip freeze for debugging. """
     sh("pip freeze > {}".format(Env.GEN_LOG_DIR + "/pip_freeze.log"))
-
-
-def print_devstack_warning():  # lint-amnesty, pylint: disable=missing-function-docstring
-    if Env.USING_DOCKER:  # pragma: no cover
-        print("********************************************************************************")
-        print("* WARNING: Mac users should run this from both the lms and studio shells")
-        print("* in docker devstack to avoid startup errors that kill your CPU.")
-        print("* For more details, see:")
-        print("* https://github.com/openedx/devstack#docker-is-using-lots-of-cpu-time-when-it-should-be-idle")
-        print("********************************************************************************")
diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py
index 9ffe8887ff..2202b34e19 100644
--- a/pavelib/utils/envs.py
+++ b/pavelib/utils/envs.py
@@ -77,23 +77,18 @@ 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 = '0.0.0.0'
-    USING_DOCKER = SERVER_HOST != '0.0.0.0'
-    DEVSTACK_SETTINGS = 'devstack_docker' if USING_DOCKER else 'devstack'
+    DEVSTACK_SETTINGS = 'devstack'
     TEST_SETTINGS = 'test'
 
     # Mongo databases that will be dropped before/after the tests run
-    MONGO_HOST = 'edx.devstack.mongo' if USING_DOCKER else 'localhost'
+    MONGO_HOST = 'localhost'
 
     # Test Ids Directory
     TEST_DIR = REPO_ROOT / ".testids"
 
     # Configured browser to use for the js test suites
     SELENIUM_BROWSER = os.environ.get('SELENIUM_BROWSER', 'firefox')
-    if USING_DOCKER:
-        KARMA_BROWSER = 'ChromeDocker' if SELENIUM_BROWSER == 'chrome' else 'FirefoxDocker'
-    else:
-        KARMA_BROWSER = 'FirefoxNoUpdates'
+    KARMA_BROWSER = 'FirefoxNoUpdates'
 
     # Files used to run each of the js test suites
     # TODO:  Store this as a dict. Order seems to matter for some