diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py
index 1e0a35d706e..09ef2d917ec 100644
--- a/lib/spack/spack/test/cmd/env.py
+++ b/lib/spack/spack/test/cmd/env.py
@@ -3191,9 +3191,10 @@ def test_environment_created_in_users_location(mutable_config, tmpdir):
     assert tmpdir.strpath in env_dir
     assert not os.path.isdir(env_dir)
 
-    env("create", "test")
+    dir_name = "user_env"
+    env("create", dir_name)
     out = env("list")
 
-    assert "test" in out
-    assert env_dir in ev.root("test")
-    assert os.path.isdir(os.path.join(env_dir, "test"))
+    assert dir_name in out
+    assert env_dir in ev.root(dir_name)
+    assert os.path.isdir(os.path.join(env_dir, dir_name))
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 9c727536da3..bbbe6ce4459 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -217,6 +217,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
 
     # ###################### Conflicts ##########################
 
+    conflicts("~hdf5", when="+exodus")
     # Epetra stack
     with when("~epetra"):
         conflicts("+amesos")