1 files changed, 17 insertions, 8 deletions
diff --git a/test/buildtool/storage/local_ac.test.cpp b/test/buildtool/storage/local_ac.test.cpp
index 4092ca1d..f2ca3a15 100644
--- a/test/buildtool/storage/local_ac.test.cpp
+++ b/test/buildtool/storage/local_ac.test.cpp
@@ -20,6 +20,7 @@
 #include "src/buildtool/common/bazel_types.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
+#include "src/buildtool/storage/config.hpp"
 #include "src/buildtool/storage/storage.hpp"
 #include "test/utils/hermeticity/local.hpp"
 
@@ -32,8 +33,10 @@
 TEST_CASE_METHOD(HermeticLocalTestFixture,
                  "LocalAC: Single action, single result",
                  "[storage]") {
-    auto const& ac = Storage::Instance().ActionCache();
-    auto const& cas = Storage::Instance().CAS();
+    auto const storage = Storage::Create(&StorageConfig::Instance());
+
+    auto const& ac = storage.ActionCache();
+    auto const& cas = storage.CAS();
 
     auto action_id = ArtifactDigest::Create<ObjectType::File>("action");
     CHECK(not ac.CachedResult(action_id));
@@ -45,8 +48,10 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
 TEST_CASE_METHOD(HermeticLocalTestFixture,
                  "LocalAC: Two different actions, two different results",
                  "[storage]") {
-    auto const& ac = Storage::Instance().ActionCache();
-    auto const& cas = Storage::Instance().CAS();
+    auto const storage = Storage::Create(&StorageConfig::Instance());
+
+    auto const& ac = storage.ActionCache();
+    auto const& cas = storage.CAS();
 
     auto action_id1 = ArtifactDigest::Create<ObjectType::File>("action1");
     auto action_id2 = ArtifactDigest::Create<ObjectType::File>("action2");
@@ -74,8 +79,10 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
 TEST_CASE_METHOD(HermeticLocalTestFixture,
                  "LocalAC: Two different actions, same two results",
                  "[storage]") {
-    auto const& ac = Storage::Instance().ActionCache();
-    auto const& cas = Storage::Instance().CAS();
+    auto const storage = Storage::Create(&StorageConfig::Instance());
+
+    auto const& ac = storage.ActionCache();
+    auto const& cas = storage.CAS();
 
     auto action_id1 = ArtifactDigest::Create<ObjectType::File>("action1");
     auto action_id2 = ArtifactDigest::Create<ObjectType::File>("action2");
@@ -103,8 +110,10 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
 TEST_CASE_METHOD(HermeticLocalTestFixture,
                  "LocalAC: Same two actions, two different results",
                  "[storage]") {
-    auto const& ac = Storage::Instance().ActionCache();
-    auto const& cas = Storage::Instance().CAS();
+    auto const storage = Storage::Create(&StorageConfig::Instance());
+
+    auto const& ac = storage.ActionCache();
+    auto const& cas = storage.CAS();
 
     auto action_id = ArtifactDigest::Create<ObjectType::File>("same action");
     CHECK(not ac.CachedResult(action_id));