diff --git a/tests/daemon/mgmt/channel-status-publisher.cpp b/tests/daemon/mgmt/channel-status-publisher.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/channel-status-publisher.cpp
rename to tests/daemon/mgmt/channel-status-publisher.t.cpp
diff --git a/tests/daemon/mgmt/command-validator.cpp b/tests/daemon/mgmt/command-validator.t.cpp
similarity index 97%
rename from tests/daemon/mgmt/command-validator.cpp
rename to tests/daemon/mgmt/command-validator.t.cpp
index ac32a6e..f29ff6d 100644
--- a/tests/daemon/mgmt/command-validator.cpp
+++ b/tests/daemon/mgmt/command-validator.t.cpp
@@ -1,11 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  Regents of the University of California,
- *                     Arizona Board of Regents,
- *                     Colorado State University,
- *                     University Pierre & Marie Curie, Sorbonne University,
- *                     Washington University in St. Louis,
- *                     Beijing Institute of Technology
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "mgmt/command-validator.hpp"
 #include "core/config-file.hpp"
@@ -33,7 +34,6 @@
 #include <fstream>
 
 namespace nfd {
-
 namespace tests {
 
 NFD_LOG_INIT("CommandValidatorTest");
@@ -653,5 +653,4 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
-
 } // namespace nfd
diff --git a/tests/daemon/mgmt/face-manager.cpp b/tests/daemon/mgmt/face-manager.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/face-manager.cpp
rename to tests/daemon/mgmt/face-manager.t.cpp
diff --git a/tests/daemon/mgmt/face-query-status-publisher.cpp b/tests/daemon/mgmt/face-query-status-publisher.t.cpp
similarity index 91%
rename from tests/daemon/mgmt/face-query-status-publisher.cpp
rename to tests/daemon/mgmt/face-query-status-publisher.t.cpp
index 948ee88..076c384 100644
--- a/tests/daemon/mgmt/face-query-status-publisher.cpp
+++ b/tests/daemon/mgmt/face-query-status-publisher.t.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -30,7 +30,7 @@
 
 NFD_LOG_INIT("FaceQueryStatusPublisherTest");
 
-BOOST_FIXTURE_TEST_SUITE(MgmtFaceQuerySatusPublisher, FaceQueryStatusPublisherFixture)
+BOOST_FIXTURE_TEST_SUITE(MgmtFaceQueryStatusPublisher, FaceQueryStatusPublisherFixture)
 
 BOOST_AUTO_TEST_CASE(NoConditionFilter)
 {
diff --git a/tests/daemon/mgmt/face-status-publisher.cpp b/tests/daemon/mgmt/face-status-publisher.t.cpp
similarity index 96%
rename from tests/daemon/mgmt/face-status-publisher.cpp
rename to tests/daemon/mgmt/face-status-publisher.t.cpp
index 5a8bdd0..0843881 100644
--- a/tests/daemon/mgmt/face-status-publisher.cpp
+++ b/tests/daemon/mgmt/face-status-publisher.t.cpp
@@ -30,7 +30,7 @@
 
 NFD_LOG_INIT("FaceStatusPublisherTest");
 
-BOOST_FIXTURE_TEST_SUITE(MgmtFaceSatusPublisher, FaceStatusPublisherFixture)
+BOOST_FIXTURE_TEST_SUITE(MgmtFaceStatusPublisher, FaceStatusPublisherFixture)
 
 BOOST_AUTO_TEST_CASE(EncodingDecoding)
 {
diff --git a/tests/daemon/mgmt/fib-enumeration-publisher.cpp b/tests/daemon/mgmt/fib-enumeration-publisher.t.cpp
similarity index 96%
rename from tests/daemon/mgmt/fib-enumeration-publisher.cpp
rename to tests/daemon/mgmt/fib-enumeration-publisher.t.cpp
index 0a79fdb..62ea6a7 100644
--- a/tests/daemon/mgmt/fib-enumeration-publisher.cpp
+++ b/tests/daemon/mgmt/fib-enumeration-publisher.t.cpp
@@ -40,9 +40,7 @@
 
 NFD_LOG_INIT("TestFibEnumerationPublisher");
 
-
-
-BOOST_FIXTURE_TEST_SUITE(MgmtFibEnumeration, FibEnumerationPublisherFixture)
+BOOST_FIXTURE_TEST_SUITE(MgmtFibEnumerationPublisher, FibEnumerationPublisherFixture)
 
 BOOST_AUTO_TEST_CASE(TestFibEnumerationPublisher)
 {
diff --git a/tests/daemon/mgmt/fib-manager.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/fib-manager.cpp
rename to tests/daemon/mgmt/fib-manager.t.cpp
diff --git a/tests/daemon/mgmt/general-config-section.cpp b/tests/daemon/mgmt/general-config-section.t.cpp
similarity index 97%
rename from tests/daemon/mgmt/general-config-section.cpp
rename to tests/daemon/mgmt/general-config-section.t.cpp
index b18e274..83063b9 100644
--- a/tests/daemon/mgmt/general-config-section.cpp
+++ b/tests/daemon/mgmt/general-config-section.t.cpp
@@ -29,8 +29,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace general {
 namespace tests {
 
+using namespace nfd::tests;
+
 class GeneralConfigSectionFixture : public BaseFixture
 {
 public:
@@ -144,5 +147,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
-
+} // namespace general
 } // namespace nfd
diff --git a/tests/daemon/mgmt/internal-face.cpp b/tests/daemon/mgmt/internal-face.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/internal-face.cpp
rename to tests/daemon/mgmt/internal-face.t.cpp
diff --git a/tests/daemon/mgmt/manager-base.cpp b/tests/daemon/mgmt/manager-base.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/manager-base.cpp
rename to tests/daemon/mgmt/manager-base.t.cpp
diff --git a/tests/daemon/mgmt/status-server.cpp b/tests/daemon/mgmt/status-server.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/status-server.cpp
rename to tests/daemon/mgmt/status-server.t.cpp
diff --git a/tests/daemon/mgmt/strategy-choice-manager.cpp b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/strategy-choice-manager.cpp
rename to tests/daemon/mgmt/strategy-choice-manager.t.cpp
diff --git a/tests/daemon/mgmt/strategy-choice-publisher.cpp b/tests/daemon/mgmt/strategy-choice-publisher.t.cpp
similarity index 100%
rename from tests/daemon/mgmt/strategy-choice-publisher.cpp
rename to tests/daemon/mgmt/strategy-choice-publisher.t.cpp
diff --git a/tests/daemon/mgmt/tables-config-section.cpp b/tests/daemon/mgmt/tables-config-section.t.cpp
similarity index 95%
rename from tests/daemon/mgmt/tables-config-section.cpp
rename to tests/daemon/mgmt/tables-config-section.t.cpp
index 5129287..1735154 100644
--- a/tests/daemon/mgmt/tables-config-section.cpp
+++ b/tests/daemon/mgmt/tables-config-section.t.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -82,7 +82,7 @@
   ConfigFile m_config;
 };
 
-BOOST_FIXTURE_TEST_SUITE(TestTableConfigSection, TablesConfigSectionFixture)
+BOOST_FIXTURE_TEST_SUITE(MgmtTableConfigSection, TablesConfigSectionFixture)
 
 BOOST_AUTO_TEST_CASE(ConfigureTablesWithDefaults)
 {