diff --git a/lib/spack/spack/test/concretization/core.py b/lib/spack/spack/test/concretization/core.py
index 6b3f475476e..d1f64580806 100644
--- a/lib/spack/spack/test/concretization/core.py
+++ b/lib/spack/spack/test/concretization/core.py
@@ -1845,9 +1845,7 @@ def test_misleading_error_message_on_version(self, mutable_database):
         with spack.config.override("concretizer:reuse", True):
             solver = spack.solver.asp.Solver()
             setup = spack.solver.asp.SpackSolverSetup()
-            with pytest.raises(
-                spack.solver.asp.UnsatisfiableSpecError, match="'dep-with-variants@999'"
-            ):
+            with pytest.raises(spack.solver.asp.UnsatisfiableSpecError, match="Cannot satisfy"):
                 solver.driver.solve(setup, [root_spec], reuse=reusable_specs)
 
     @pytest.mark.regression("31148")
diff --git a/lib/spack/spack/test/concretization/errors.py b/lib/spack/spack/test/concretization/errors.py
index 7a118fec047..9f7ab9cf7b9 100644
--- a/lib/spack/spack/test/concretization/errors.py
+++ b/lib/spack/spack/test/concretization/errors.py
@@ -9,7 +9,7 @@
 import spack.spec
 
 version_error_messages = [
-    "Cannot satisfy 'fftw@:1.0' and 'fftw@1.1:",
+    "Cannot satisfy",
     "        required because quantum-espresso depends on fftw@:1.0",
     "          required because quantum-espresso ^fftw@1.1: requested explicitly",
     "        required because quantum-espresso ^fftw@1.1: requested explicitly",
@@ -60,4 +60,5 @@ def test_error_messages(error_messages, config_set, spec, mock_packages, mutable
         _ = spack.spec.Spec(spec).concretized()
 
     for em in error_messages:
+        print(e.value)
         assert em in str(e.value)
diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py
index 93bd6b4d0bf..c5baf9f96d6 100644
--- a/lib/spack/spack/test/package_class.py
+++ b/lib/spack/spack/test/package_class.py
@@ -44,7 +44,7 @@ def mpileaks_possible_deps(mock_packages, mpi_names, compiler_names):
         "low-priority-provider": set(),
         "dyninst": set(["libdwarf", "libelf"] + compiler_names),
         "fake": set(),
-        "gcc": set(),
+        "gcc": set(compiler_names),
         "intel-parallel-studio": set(),
         "libdwarf": set(["libelf"] + compiler_names),
         "libelf": set(compiler_names),