diff --git a/test/MantleAPI/Common/logger_test.cc b/test/MantleAPI/Common/logger_test.cc
index 1ce588a029a5d0d3bf941c7d56653e036763e968..d9f780ae4a20de23c46845c7dad0af222ad816a1 100644
--- a/test/MantleAPI/Common/logger_test.cc
+++ b/test/MantleAPI/Common/logger_test.cc
@@ -20,7 +20,6 @@ namespace
 using mantle_api::LogLevel;
 using testing::_;
 using testing::Const;
-using testing::DefaultValue;
 using testing::Return;
 
 class LoggerTest : public testing::Test
@@ -37,11 +36,9 @@ protected:
 
 TEST_F(LoggerTest, GetCurrentLogLevel)
 {
-  DefaultValue<LogLevel>::Set(LogLevel::kTrace);
-
   EXPECT_CALL(Const(mock_logger_), GetCurrentLogLevel())  //
       .Times(1)                                           //
-      .WillOnce(Return(LogLevel::kTrace));
+      .WillRepeatedly(Return(LogLevel::kTrace));
   ASSERT_NO_THROW(std::ignore = logger_.GetCurrentLogLevel());
 }
 
diff --git a/test/MantleAPI/Common/mock_logger.h b/test/MantleAPI/Common/mock_logger.h
index 748f1d47ff26f3b0644772f9a0c5468300b7da57..44e2b22ad6551dcfaf0e323b1257d3d3041b1e66 100644
--- a/test/MantleAPI/Common/mock_logger.h
+++ b/test/MantleAPI/Common/mock_logger.h
@@ -33,12 +33,15 @@ public:
     auto print = [](LogLevel level, std::string_view message)
     { std::cout
           << "["
-          << log_utils::ToStringView(level)
+          << level  // use the ostream operator from log_utils
           << "] "
           << std::quoted(message)
           << '\n'; };
 
     ON_CALL(*this, Log).WillByDefault(print);
+
+    ON_CALL(*this, GetCurrentLogLevel).WillByDefault([]()
+                                                     { return LogLevel::kTrace; });
   }
 };