2 files changed, 3 insertions, 5 deletions
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS
index eda8f376..8d1a5c0a 100644
--- a/test/buildtool/file_system/TARGETS
+++ b/test/buildtool/file_system/TARGETS
@@ -62,11 +62,11 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
-    , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["utils", "shell_quoting"]
+    , ["utils", "test_hash_function_type"]
     ]
   , "stage": ["test", "buildtool", "file_system"]
   }
diff --git a/test/buildtool/file_system/file_root.test.cpp b/test/buildtool/file_system/file_root.test.cpp
index 1a27dd1b..94a2a552 100644
--- a/test/buildtool/file_system/file_root.test.cpp
+++ b/test/buildtool/file_system/file_root.test.cpp
@@ -25,10 +25,10 @@
 #include "src/buildtool/common/artifact_description.hpp"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/artifact_digest_factory.hpp"
-#include "src/buildtool/common/protocol_traits.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "test/utils/container_matchers.hpp"
+#include "test/utils/hermeticity/test_hash_function_type.hpp"
 #include "test/utils/shell_quoting.hpp"
 
 namespace {
@@ -380,9 +380,7 @@ static void CheckGitRoot(HashFunction::Type hash_type,
                          bool ignore_special) noexcept;
 
 TEST_CASE("Creating artifact descriptions", "[file_root]") {
-    auto const hash_type = ProtocolTraits::Instance().IsCompatible()
-                               ? HashFunction::Type::PlainSHA256
-                               : HashFunction::Type::GitSHA1;
+    auto const hash_type = TestHashType::ReadFromEnvironment();
 
     SECTION("local root") {
         CheckLocalRoot(hash_type, /*ignore_special=*/false);