diff --git a/base_c/test/main.cc b/base_c/test/main.cc
index eb0dc83..3e1d70a 100644
--- a/base_c/test/main.cc
+++ b/base_c/test/main.cc
@@ -41,22 +41,33 @@
 
 #include <embb/base/c/memory_allocation.h>
 
+using embb::base::test::AllocTest;
+using embb::base::test::DurationTest;
+using embb::base::test::TimeTest;
+using embb::base::test::CounterTest;
+using embb::base::test::MutexTest;
+using embb::base::test::ThreadIndexTest;
+using embb::base::test::CoreSetTest;
+using embb::base::test::ConditionVarTest;
+using embb::base::test::ThreadTest;
+using embb::base::test::ThreadSpecificStorageTest;
+
 PT_MAIN("Base C") {
   embb_log_set_log_level(EMBB_LOG_LEVEL_WARNING);
   unsigned int max_threads =
       static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
   embb_thread_set_max_count(max_threads);
 
-  PT_RUN(embb::base::test::AllocTest);
-  PT_RUN(embb::base::test::DurationTest);
-  PT_RUN(embb::base::test::TimeTest);
-  PT_RUN(embb::base::test::CounterTest);
-  PT_RUN(embb::base::test::MutexTest);
-  PT_RUN(embb::base::test::ThreadIndexTest);
-  PT_RUN(embb::base::test::CoreSetTest);
-  PT_RUN(embb::base::test::ConditionVarTest);
-  PT_RUN(embb::base::test::ThreadTest);
-  PT_RUN(embb::base::test::ThreadSpecificStorageTest);
+  PT_RUN(AllocTest);
+  PT_RUN(DurationTest);
+  PT_RUN(TimeTest);
+  PT_RUN(CounterTest);
+  PT_RUN(MutexTest);
+  PT_RUN(ThreadIndexTest);
+  PT_RUN(CoreSetTest);
+  PT_RUN(ConditionVarTest);
+  PT_RUN(ThreadTest);
+  PT_RUN(ThreadSpecificStorageTest);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
diff --git a/base_cpp/test/main.cc b/base_cpp/test/main.cc
index 6184ee8..b621a4d 100644
--- a/base_cpp/test/main.cc
+++ b/base_cpp/test/main.cc
@@ -37,18 +37,27 @@
 
 #include <embb/base/c/memory_allocation.h>
 
+using embb::base::test::CoreSetTest;
+using embb::base::test::DurationTest;
+using embb::base::test::ConditionVarTest;
+using embb::base::test::MutexTest;
+using embb::base::test::ThreadSpecificStorageTest;
+using embb::base::test::AtomicTest;
+using embb::base::test::MemoryAllocationTest;
+using embb::base::test::ThreadTest;
+
 PT_MAIN("Base C++") {
   unsigned int max_threads =
       static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
   embb_thread_set_max_count(max_threads);
-  PT_RUN(embb::base::test::CoreSetTest);
-  PT_RUN(embb::base::test::DurationTest);
-  PT_RUN(embb::base::test::ConditionVarTest);
-  PT_RUN(embb::base::test::MutexTest);
-  PT_RUN(embb::base::test::ThreadSpecificStorageTest);
-  PT_RUN(embb::base::test::AtomicTest);
-  PT_RUN(embb::base::test::MemoryAllocationTest);
-  PT_RUN(embb::base::test::ThreadTest);
+  PT_RUN(CoreSetTest);
+  PT_RUN(DurationTest);
+  PT_RUN(ConditionVarTest);
+  PT_RUN(MutexTest);
+  PT_RUN(ThreadSpecificStorageTest);
+  PT_RUN(AtomicTest);
+  PT_RUN(MemoryAllocationTest);
+  PT_RUN(ThreadTest);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
diff --git a/containers_cpp/test/queue_test.h b/containers_cpp/test/queue_test.h
index 830e123..1b11329 100644
--- a/containers_cpp/test/queue_test.h
+++ b/containers_cpp/test/queue_test.h
@@ -27,10 +27,10 @@
 #ifndef CONTAINERS_CPP_TEST_QUEUE_TEST_H_
 #define CONTAINERS_CPP_TEST_QUEUE_TEST_H_
 
-#include <vector>
-#include <utility>
 #include <partest/partest.h>
 #include <embb/base/duration.h>
+#include <vector>
+#include <utility>
 
 namespace embb {
 namespace containers {
@@ -113,9 +113,9 @@ class QueueTest : public partest::TestCase {
  public:
   QueueTest();
 };
-} // namespace test
-} // namespace containers
-} // namespace embb
+}  // namespace test
+}  // namespace containers
+}  // namespace embb
 
 #include "./queue_test-inl.h"