2 files changed, 7 insertions, 9 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index cac3c109..88915e7e 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -12,7 +12,11 @@
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
-    , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/execution_api/common"
+      , "artifact_blob_container"
+      ]
     , [ "@"
       , "src"
       , "src/buildtool/execution_api/common"
diff --git a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
index ad2e0678..606212a6 100644
--- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
@@ -29,7 +29,7 @@
 #include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
-#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
 #include "src/buildtool/execution_api/common/content_blob_container.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
@@ -63,7 +63,7 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") {
             hash_function, content);
 
         // Valid blob
-        BazelBlob blob{bazel_digest, content, /*is_exec=*/false};
+        ArtifactBlob blob{digest, content, /*is_exec=*/false};
 
         // Search blob via digest
         auto digests =
@@ -89,14 +89,8 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") {
             "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
         faulty_digest.set_size_bytes(4);
 
-        // Faulty blob
-        BazelBlob faulty_blob{faulty_digest, content, /*is_exec=*/false};
-
         // Search faulty digest
         CHECK(cas_client.FindMissingBlobs(instance_name, {faulty_digest})
                   .size() == 1);
-
-        // Try upload faulty blob
-        CHECK(cas_client.BatchUpdateBlobs(instance_name, {faulty_blob}) == 0U);
     }
 }