diff --git a/test/mocking_utils/filesystem.hpp b/test/mocking_utils/filesystem.hpp
index 920e048d..a845288e 100644
--- a/test/mocking_utils/filesystem.hpp
+++ b/test/mocking_utils/filesystem.hpp
@@ -40,7 +40,7 @@
 
 #include "rcutils/macros.h"
 
-#include "patch.hpp"
+#include "./patch.hpp"
 
 namespace mocking_utils
 {
diff --git a/test/mocking_utils/patch.hpp b/test/mocking_utils/patch.hpp
index a5b5905f..ef0de4d1 100644
--- a/test/mocking_utils/patch.hpp
+++ b/test/mocking_utils/patch.hpp
@@ -35,7 +35,7 @@
 #include "mimick/mimick.h"
 #include "rcutils/macros.h"
 
-#include "remove_noexcept.hpp"
+#include "./remove_noexcept.hpp"
 
 namespace mocking_utils
 {
diff --git a/test/test_logging_macros.cpp b/test/test_logging_macros.cpp
index 6637c4df..c01eef11 100644
--- a/test/test_logging_macros.cpp
+++ b/test/test_logging_macros.cpp
@@ -146,7 +146,7 @@ TEST_F(TestLoggingMacros, test_logging_skipfirst) {
 }
 
 TEST_F(TestLoggingMacros, test_logging_throttle) {
-  using namespace std::chrono_literals;
+  using std::chrono_literals::operator""ms;
   const auto start = std::chrono::system_clock::now();
   const auto throttle_time = 200ms;
   bool first = true;
@@ -177,7 +177,7 @@ TEST_F(TestLoggingMacros, test_logging_throttle) {
 }
 
 TEST_F(TestLoggingMacros, test_logging_skipfirst_throttle) {
-  using namespace std::chrono_literals;
+  using std::chrono_literals::operator""ms;
   const auto start = std::chrono::system_clock::now();
   const auto throttle_time = 200ms;
   bool first = true;