diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py
index e35b67ea197..3ed8f70552f 100644
--- a/lib/spack/spack/test/build_environment.py
+++ b/lib/spack/spack/test/build_environment.py
@@ -770,8 +770,6 @@ def test_rpath_with_duplicate_link_deps():
         # Check that the special case for Apple's clang is treated correctly
         # i.e. it won't try to detect the version again
         ("apple-clang@=9.1.0", "x86_64", "-march=x86-64"),
-        # FIXME (compiler as nodes): Check mixed toolchain
-        # ("clang@8.0.0", "broadwell", ""),
     ],
 )
 @pytest.mark.filterwarnings("ignore:microarchitecture specific")
diff --git a/lib/spack/spack/test/cray_manifest.py b/lib/spack/spack/test/cray_manifest.py
index 7772985e02c..c19858c7539 100644
--- a/lib/spack/spack/test/cray_manifest.py
+++ b/lib/spack/spack/test/cray_manifest.py
@@ -289,7 +289,7 @@ def test_failed_translate_compiler_name(_common_arch):
     unknown_compiler = JsonCompilerEntry(name="unknown", version="1.0")
 
     with pytest.raises(spack.compilers.config.UnknownCompilerError):
-        compiler_from_entry(unknown_compiler.compiler_json(), "/example/file")
+        compiler_from_entry(unknown_compiler.compiler_json(), manifest_path="/example/file")
 
     spec_json = JsonSpecEntry(
         name="packagey",