diff --git a/test/oatpp/AllTestsMain.cpp b/test/oatpp/AllTestsMain.cpp
index 9682bd5f..9a976c5e 100644
--- a/test/oatpp/AllTestsMain.cpp
+++ b/test/oatpp/AllTestsMain.cpp
@@ -119,21 +119,21 @@ void runTests() {
 
   OATPP_RUN_TEST(oatpp::test::core::data::resource::InMemoryDataTest);
 
-  OATPP_RUN_TEST(oatpp::async::test::ConditionVariableTest);
-  OATPP_RUN_TEST(oatpp::async::test::LockTest);
+  OATPP_RUN_TEST(oatpp::async::ConditionVariableTest);
+  OATPP_RUN_TEST(oatpp::async::LockTest);
   OATPP_RUN_TEST(oatpp::test::parser::CaretTest);
 
   OATPP_RUN_TEST(oatpp::test::core::provider::PoolTest);
   OATPP_RUN_TEST(oatpp::test::core::provider::PoolTemplateTest);
 
-  OATPP_RUN_TEST(oatpp::json::test::EnumTest);
-  OATPP_RUN_TEST(oatpp::json::test::BooleanTest);
+  OATPP_RUN_TEST(oatpp::json::EnumTest);
+  OATPP_RUN_TEST(oatpp::json::BooleanTest);
 
-  OATPP_RUN_TEST(oatpp::json::test::UnorderedSetTest);
+  OATPP_RUN_TEST(oatpp::json::UnorderedSetTest);
 
-  OATPP_RUN_TEST(oatpp::json::test::DeserializerTest);
-  OATPP_RUN_TEST(oatpp::json::test::DTOMapperPerfTest);
-  OATPP_RUN_TEST(oatpp::json::test::DTOMapperTest);
+  OATPP_RUN_TEST(oatpp::json::DeserializerTest);
+  OATPP_RUN_TEST(oatpp::json::DTOMapperPerfTest);
+  OATPP_RUN_TEST(oatpp::json::DTOMapperTest);
 
   OATPP_RUN_TEST(oatpp::test::encoding::Base64Test);
   OATPP_RUN_TEST(oatpp::test::encoding::UnicodeTest);
diff --git a/test/oatpp/async/ConditionVariableTest.cpp b/test/oatpp/async/ConditionVariableTest.cpp
index 20892d48..7a1d96d6 100644
--- a/test/oatpp/async/ConditionVariableTest.cpp
+++ b/test/oatpp/async/ConditionVariableTest.cpp
@@ -27,7 +27,7 @@
 #include "oatpp/async/Executor.hpp"
 #include "oatpp/async/ConditionVariable.hpp"
 
-namespace oatpp { namespace async { namespace test {
+namespace oatpp { namespace async {
 
 namespace {
 
@@ -233,4 +233,4 @@ void ConditionVariableTest::onRun() {
 
 }
 
-}}}
+}}
diff --git a/test/oatpp/async/ConditionVariableTest.hpp b/test/oatpp/async/ConditionVariableTest.hpp
index ea83145e..9193e9c2 100644
--- a/test/oatpp/async/ConditionVariableTest.hpp
+++ b/test/oatpp/async/ConditionVariableTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_async_test_ConditionVariableTest_hpp
-#define oatpp_async_test_ConditionVariableTest_hpp
+#ifndef oatpp_async_ConditionVariableTest_hpp
+#define oatpp_async_ConditionVariableTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace async { namespace test {
+namespace oatpp { namespace async {
 
 class ConditionVariableTest : public oatpp::test::UnitTest{
 public:
@@ -37,6 +37,6 @@ public:
 
 };
 
-}}}
+}}
 
-#endif // oatpp_async_test_ConditionVariableTest_hpp
+#endif // oatpp_async_ConditionVariableTest_hpp
diff --git a/test/oatpp/async/LockTest.cpp b/test/oatpp/async/LockTest.cpp
index 55bd7056..2f119226 100644
--- a/test/oatpp/async/LockTest.cpp
+++ b/test/oatpp/async/LockTest.cpp
@@ -32,7 +32,7 @@
 #include <thread>
 #include <list>
 
-namespace oatpp { namespace async { namespace test {
+namespace oatpp { namespace async {
 
 namespace {
 
@@ -209,4 +209,4 @@ void LockTest::onRun() {
 
 }
 
-}}}
+}}
diff --git a/test/oatpp/async/LockTest.hpp b/test/oatpp/async/LockTest.hpp
index ad8f80fc..8e4569a7 100644
--- a/test/oatpp/async/LockTest.hpp
+++ b/test/oatpp/async/LockTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_async_test_LockTest_hpp
-#define oatpp_async_test_LockTest_hpp
+#ifndef oatpp_async_LockTest_hpp
+#define oatpp_async_LockTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace async { namespace test {
+namespace oatpp { namespace async {
 
 class LockTest : public oatpp::test::UnitTest{
 public:
@@ -37,6 +37,6 @@ public:
 
 };
 
-}}}
+}}
 
-#endif // oatpp_async_test_LockTest_hpp
+#endif // oatpp_async_LockTest_hpp
diff --git a/test/oatpp/json/BooleanTest.cpp b/test/oatpp/json/BooleanTest.cpp
index 1cb927ad..a1e2641b 100644
--- a/test/oatpp/json/BooleanTest.cpp
+++ b/test/oatpp/json/BooleanTest.cpp
@@ -26,7 +26,7 @@
 
 #include "oatpp/json/ObjectMapper.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 void BooleanTest::onRun() {
   oatpp::json::ObjectMapper mapper;
@@ -60,4 +60,4 @@ void BooleanTest::onRun() {
   }
 }
 
-}}}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/test/oatpp/json/BooleanTest.hpp b/test/oatpp/json/BooleanTest.hpp
index de6ad34d..e36d4360 100644
--- a/test/oatpp/json/BooleanTest.hpp
+++ b/test/oatpp/json/BooleanTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_BooleanTest_hpp
-#define oatpp_json_test_BooleanTest_hpp
+#ifndef oatpp_json_BooleanTest_hpp
+#define oatpp_json_BooleanTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 class BooleanTest : public oatpp::test::UnitTest {
 public:
@@ -35,6 +35,6 @@ public:
    void onRun() override;
 };
 
-}}}
+}}
 
-#endif /* oatpp_json_test_BooleanTest_hpp */
+#endif /* oatpp_json_BooleanTest_hpp */
diff --git a/test/oatpp/json/DTOMapperPerfTest.cpp b/test/oatpp/json/DTOMapperPerfTest.cpp
index 2daf42d7..6b3051c6 100644
--- a/test/oatpp/json/DTOMapperPerfTest.cpp
+++ b/test/oatpp/json/DTOMapperPerfTest.cpp
@@ -35,7 +35,7 @@
 
 #include "oatpp-test/Checker.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
   
 namespace {
 
@@ -98,4 +98,4 @@ void DTOMapperPerfTest::onRun() {
 
 }
   
-}}}
+}}
diff --git a/test/oatpp/json/DTOMapperPerfTest.hpp b/test/oatpp/json/DTOMapperPerfTest.hpp
index 7608a8a4..4d4547d2 100644
--- a/test/oatpp/json/DTOMapperPerfTest.hpp
+++ b/test/oatpp/json/DTOMapperPerfTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_DTOMapperPerfTest_hpp
-#define oatpp_json_test_DTOMapperPerfTest_hpp
+#ifndef oatpp_json_DTOMapperPerfTest_hpp
+#define oatpp_json_DTOMapperPerfTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
   
 class DTOMapperPerfTest : public oatpp::test::UnitTest {
 public:
@@ -37,6 +37,6 @@ public:
   
 };
   
-}}}
+}}
 
-#endif /* oatpp_json_test_DTOMapperPerfTest_hpp */
+#endif /* oatpp_json_DTOMapperPerfTest_hpp */
diff --git a/test/oatpp/json/DTOMapperTest.cpp b/test/oatpp/json/DTOMapperTest.cpp
index 7f12015d..06652dae 100644
--- a/test/oatpp/json/DTOMapperTest.cpp
+++ b/test/oatpp/json/DTOMapperTest.cpp
@@ -36,7 +36,7 @@
 
 #include "oatpp/macro/codegen.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
   
 namespace {
   
@@ -402,4 +402,4 @@ void DTOMapperTest::onRun(){
   
 #include OATPP_CODEGEN_END(DTO)
 
-}}}
+}}
diff --git a/test/oatpp/json/DTOMapperTest.hpp b/test/oatpp/json/DTOMapperTest.hpp
index 43faf67a..2b850bb2 100644
--- a/test/oatpp/json/DTOMapperTest.hpp
+++ b/test/oatpp/json/DTOMapperTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_DTOMapperTest_hpp
-#define oatpp_json_test_DTOMapperTest_hpp
+#ifndef oatpp_json_DTOMapperTest_hpp
+#define oatpp_json_DTOMapperTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
   
 class DTOMapperTest : public oatpp::test::UnitTest {
 public:
@@ -37,6 +37,6 @@ public:
   
 };
   
-}}}
+}}
 
-#endif /* oatpp_json_test_DTOMapperTest_hpp */
+#endif /* oatpp_json_DTOMapperTest_hpp */
diff --git a/test/oatpp/json/DeserializerTest.cpp b/test/oatpp/json/DeserializerTest.cpp
index ea6b3422..7907134c 100644
--- a/test/oatpp/json/DeserializerTest.cpp
+++ b/test/oatpp/json/DeserializerTest.cpp
@@ -29,7 +29,7 @@
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/macro/codegen.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 namespace {
 
@@ -324,4 +324,4 @@ void DeserializerTest::onRun(){
 
 }
   
-}}}
+}}
diff --git a/test/oatpp/json/DeserializerTest.hpp b/test/oatpp/json/DeserializerTest.hpp
index 33ec5f32..ded8a5ee 100644
--- a/test/oatpp/json/DeserializerTest.hpp
+++ b/test/oatpp/json/DeserializerTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_DeserializerTest_hpp
-#define oatpp_json_test_DeserializerTest_hpp
+#ifndef oatpp_json_DeserializerTest_hpp
+#define oatpp_json_DeserializerTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
   
 class DeserializerTest : public oatpp::test::UnitTest {
 public:
@@ -37,6 +37,6 @@ public:
   
 };
   
-}}}
+}}
 
-#endif /* oatpp_json_test_DeserializerTest_hpp */
+#endif /* oatpp_json_DeserializerTest_hpp */
diff --git a/test/oatpp/json/EnumTest.cpp b/test/oatpp/json/EnumTest.cpp
index 96f66267..e0c14d9e 100644
--- a/test/oatpp/json/EnumTest.cpp
+++ b/test/oatpp/json/EnumTest.cpp
@@ -28,7 +28,7 @@
 
 #include "oatpp/macro/codegen.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 namespace {
 
@@ -184,4 +184,4 @@ void EnumTest::onRun() {
 
 }
 
-}}}
+}}
diff --git a/test/oatpp/json/EnumTest.hpp b/test/oatpp/json/EnumTest.hpp
index ab327113..f97bef8a 100644
--- a/test/oatpp/json/EnumTest.hpp
+++ b/test/oatpp/json/EnumTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_EnumTest_hpp
-#define oatpp_json_test_EnumTest_hpp
+#ifndef oatpp_json_EnumTest_hpp
+#define oatpp_json_EnumTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 class EnumTest : public oatpp::test::UnitTest {
 public:
@@ -37,6 +37,6 @@ public:
 
 };
 
-}}}
+}}
 
-#endif /* oatpp_json_test_EnumTest_hpp */
+#endif /* oatpp_json_EnumTest_hpp */
diff --git a/test/oatpp/json/UnorderedSetTest.cpp b/test/oatpp/json/UnorderedSetTest.cpp
index ffa497ab..55893d0e 100644
--- a/test/oatpp/json/UnorderedSetTest.cpp
+++ b/test/oatpp/json/UnorderedSetTest.cpp
@@ -26,7 +26,7 @@
 
 #include "oatpp/json/ObjectMapper.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 void UnorderedSetTest::onRun() {
 
@@ -50,4 +50,4 @@ void UnorderedSetTest::onRun() {
   
 }
 
-}}}
+}}
diff --git a/test/oatpp/json/UnorderedSetTest.hpp b/test/oatpp/json/UnorderedSetTest.hpp
index 9a216ffd..27d8912a 100644
--- a/test/oatpp/json/UnorderedSetTest.hpp
+++ b/test/oatpp/json/UnorderedSetTest.hpp
@@ -22,12 +22,12 @@
  *
  ***************************************************************************/
 
-#ifndef oatpp_json_test_UnorderedSetTest_hpp
-#define oatpp_json_test_UnorderedSetTest_hpp
+#ifndef oatpp_json_UnorderedSetTest_hpp
+#define oatpp_json_UnorderedSetTest_hpp
 
 #include "oatpp-test/UnitTest.hpp"
 
-namespace oatpp { namespace json { namespace test {
+namespace oatpp { namespace json {
 
 class UnorderedSetTest : public oatpp::test::UnitTest {
 public:
@@ -37,6 +37,6 @@ public:
 
 };
 
-}}}
+}}
 
-#endif /* oatpp_json_test_UnorderedSetTest_hpp */
+#endif /* oatpp_json_UnorderedSetTest_hpp */