2 files changed, 12 insertions, 2 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index eeae31ea..dd93a373 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -88,6 +88,7 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["utils", "catch-main-remote-execution"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
     , ["buildtool/execution_api/common", "api_test"]
     ]
diff --git a/test/buildtool/execution_api/bazel/bazel_api.test.cpp b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
index 268edb1e..af457066 100644
--- a/test/buildtool/execution_api/bazel/bazel_api.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_api.test.cpp
@@ -13,9 +13,11 @@
 // limitations under the License.
 
 #include <cstdlib>
+#include <optional>
 #include <string>
 
 #include "catch2/catch_test_macros.hpp"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "test/buildtool/execution_api/common/api_test.hpp"
@@ -25,8 +27,15 @@ namespace {
 
 auto const kApiFactory = []() {
     static auto const& server = RemoteExecutionConfig::RemoteAddress();
-    return IExecutionApi::Ptr{
-        new BazelApi{"remote-execution", server->host, server->port, {}}};
+    std::optional<Auth::TLS> auth = {};
+    if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) {
+        auth = Auth::TLS::Instance();
+    }
+    return IExecutionApi::Ptr{new BazelApi{"remote-execution",
+                                           server->host,
+                                           server->port,
+                                           auth ? &*auth : nullptr,
+                                           {}}};
 };
 
 }  // namespace