diff --git a/tests/common-cleanup.hpp b/tests/common-cleanup.hpp
index 7da2bc2de..8e5cee6b1 100644
--- a/tests/common-cleanup.hpp
+++ b/tests/common-cleanup.hpp
@@ -16,8 +16,7 @@
 
 #include <boost/filesystem.hpp>
 
-namespace testing {
-namespace cleanup {
+namespace testing::cleanup {
 
 /**
  * RAII structure to remove a file upon destruction.
@@ -56,7 +55,6 @@ class file_t
     std::string m_filename;
 };
 
-} // namespace cleanup
-} // namespace testing
+} // namespace testing::cleanup
 
 #endif // OSM2PGSQL_TESTS_COMMON_CLEANUP_HPP
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
index 4069a81de..01a7e1255 100644
--- a/tests/common-pg.hpp
+++ b/tests/common-pg.hpp
@@ -30,9 +30,8 @@
 #include <unistd.h>
 #endif
 
-namespace testing {
 /// Helper classes for postgres connections
-namespace pg {
+namespace testing::pg {
 
 class conn_t : public pg_conn_t
 {
@@ -153,7 +152,6 @@ class tempdb_t
     std::string m_db_name;
 };
 
-} // namespace pg
-} // namespace testing
+} // namespace testing::pg
 
 #endif // OSM2PGSQL_TESTS_COMMON_PG_HPP