diff --git a/pytest.ini b/pytest.ini
index 4b2786181..e0ef43291 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
-addopts = starcluster -xvs -rs --pep8 --flakes --clearcache
+addopts = starcluster -xvs -rs --pep8 --flakes
 pep8ignore = W503 E402 E241
diff --git a/setup.py b/setup.py
index ead694ad6..cbc2764ef 100644
--- a/setup.py
+++ b/setup.py
@@ -55,8 +55,6 @@ def run_tests(self):
             # Needed in order for pytest_cache to load properly
             # Alternate fix: import pytest_cache and pass to pytest.main
             import _pytest.config
-            pm = _pytest.config.get_plugin_manager()
-            pm.consider_setuptools_entrypoints()
             errno = pytest.main(self.test_args)
             sys.exit(errno)