diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py
index bd1e8a1b497..c691d06ac77 100644
--- a/lib/spack/spack/test/cmd/uninstall.py
+++ b/lib/spack/spack/test/cmd/uninstall.py
@@ -223,7 +223,7 @@ class TestUninstallFromEnv(object):
     concretize = SpackCommand("concretize")
     find = SpackCommand("find")
 
-    @pytest.fixture
+    @pytest.fixture(scope="function")
     def environment_setup(
         self, mutable_mock_env_path, config, mock_packages, mutable_database, install_mockery
     ):
@@ -242,6 +242,7 @@ def environment_setup(
             TestUninstallFromEnv.add("dt-diamond-bottom")
             TestUninstallFromEnv.concretize()
             install("--fake")
+        yield "environment_setup"
 
     def test_basic_env_sanity(self, environment_setup):
         for env_name in ["e1", "e2"]: