diff --git a/tests/unit-tests/management/test-nfd-channel-status.cpp b/tests/unit-tests/management/nfd-channel-status.t.cpp
similarity index 94%
rename from tests/unit-tests/management/test-nfd-channel-status.cpp
rename to tests/unit-tests/management/nfd-channel-status.t.cpp
index 5e3ea6c..7fff8d4 100644
--- a/tests/unit-tests/management/test-nfd-channel-status.cpp
+++ b/tests/unit-tests/management/nfd-channel-status.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -27,7 +27,7 @@
 namespace nfd {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdChannelStatus)
+BOOST_AUTO_TEST_SUITE(ManagementNfdChannelStatus)
 
 BOOST_AUTO_TEST_CASE(Encode)
 {
diff --git a/tests/unit-tests/management/test-nfd-command-options.cpp b/tests/unit-tests/management/nfd-command-options.t.cpp
similarity index 96%
rename from tests/unit-tests/management/test-nfd-command-options.cpp
rename to tests/unit-tests/management/nfd-command-options.t.cpp
index b1afb35..8a2a4b1 100644
--- a/tests/unit-tests/management/test-nfd-command-options.cpp
+++ b/tests/unit-tests/management/nfd-command-options.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -27,7 +27,7 @@
 namespace nfd {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdCommandOptions)
+BOOST_AUTO_TEST_SUITE(ManagementNfdCommandOptions)
 
 BOOST_AUTO_TEST_CASE(Timeout)
 {
diff --git a/tests/unit-tests/management/test-nfd-control-command.cpp b/tests/unit-tests/management/nfd-control-command.t.cpp
similarity index 98%
rename from tests/unit-tests/management/test-nfd-control-command.cpp
rename to tests/unit-tests/management/nfd-control-command.t.cpp
index a0ea8c1..a82c8b9 100644
--- a/tests/unit-tests/management/test-nfd-control-command.cpp
+++ b/tests/unit-tests/management/nfd-control-command.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdControlCommand)
+BOOST_AUTO_TEST_SUITE(ManagementNfdControlCommand)
 
 BOOST_AUTO_TEST_CASE(FaceCreate)
 {
@@ -286,5 +287,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-control-parameters.cpp b/tests/unit-tests/management/nfd-control-parameters.t.cpp
similarity index 96%
rename from tests/unit-tests/management/test-nfd-control-parameters.cpp
rename to tests/unit-tests/management/nfd-control-parameters.t.cpp
index 737e89e..9a959e4 100644
--- a/tests/unit-tests/management/test-nfd-control-parameters.cpp
+++ b/tests/unit-tests/management/nfd-control-parameters.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdControlParameters)
+BOOST_AUTO_TEST_SUITE(ManagementNfdControlParameters)
 
 BOOST_AUTO_TEST_CASE(FaceOptions)
 {
@@ -138,5 +139,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-control-response.cpp b/tests/unit-tests/management/nfd-control-response.t.cpp
similarity index 93%
rename from tests/unit-tests/management/test-nfd-control-response.cpp
rename to tests/unit-tests/management/nfd-control-response.t.cpp
index 8ca9e8b..9ce5dcb 100644
--- a/tests/unit-tests/management/test-nfd-control-response.cpp
+++ b/tests/unit-tests/management/nfd-control-response.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdControlResponse)
+BOOST_AUTO_TEST_SUITE(ManagementNfdControlResponse)
 
 const uint8_t TestControlResponse[] = {0x65, 0x17,
                                        0x66, 0x02, 0x01, 0x94, 0x67, 0x11, 0x4e, 0x6f, 0x74,
@@ -58,5 +59,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-controller.cpp b/tests/unit-tests/management/nfd-controller.t.cpp
similarity index 98%
rename from tests/unit-tests/management/test-nfd-controller.cpp
rename to tests/unit-tests/management/nfd-controller.t.cpp
index 8555dde..2419627 100644
--- a/tests/unit-tests/management/test-nfd-controller.cpp
+++ b/tests/unit-tests/management/nfd-controller.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -35,7 +35,7 @@
 using ndn::util::DummyClientFace;
 using ndn::util::makeDummyClientFace;
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdController)
+BOOST_AUTO_TEST_SUITE(ManagementNfdController)
 
 class CommandFixture : public ndn::tests::UnitTestTimeFixture
 {
diff --git a/tests/unit-tests/management/test-nfd-face-event-notification.cpp b/tests/unit-tests/management/nfd-face-event-notification.t.cpp
similarity index 97%
rename from tests/unit-tests/management/test-nfd-face-event-notification.cpp
rename to tests/unit-tests/management/nfd-face-event-notification.t.cpp
index 5d014d8..0fce21b 100644
--- a/tests/unit-tests/management/test-nfd-face-event-notification.cpp
+++ b/tests/unit-tests/management/nfd-face-event-notification.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdFaceEventNotification)
+BOOST_AUTO_TEST_SUITE(ManagementNfdFaceEventNotification)
 
 BOOST_AUTO_TEST_CASE(Traits)
 {
@@ -163,5 +164,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-face-query-filter.cpp b/tests/unit-tests/management/nfd-face-query-filter.t.cpp
similarity index 95%
rename from tests/unit-tests/management/test-nfd-face-query-filter.cpp
rename to tests/unit-tests/management/nfd-face-query-filter.t.cpp
index 575c475..845e314 100644
--- a/tests/unit-tests/management/test-nfd-face-query-filter.cpp
+++ b/tests/unit-tests/management/nfd-face-query-filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdFaceQueryFilter)
+BOOST_AUTO_TEST_SUITE(ManagementNfdFaceQueryFilter)
 
 BOOST_AUTO_TEST_CASE(Encode)
 {
@@ -93,5 +94,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-face-status.cpp b/tests/unit-tests/management/nfd-face-status.t.cpp
similarity index 96%
rename from tests/unit-tests/management/test-nfd-face-status.cpp
rename to tests/unit-tests/management/nfd-face-status.t.cpp
index 4c1a7fa..f502f13 100644
--- a/tests/unit-tests/management/test-nfd-face-status.cpp
+++ b/tests/unit-tests/management/nfd-face-status.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdFaceStatus)
+BOOST_AUTO_TEST_SUITE(ManagementNfdFaceStatus)
 
 BOOST_AUTO_TEST_CASE(Encode)
 {
@@ -99,5 +100,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-fib-entry.cpp b/tests/unit-tests/management/nfd-fib-entry.t.cpp
similarity index 96%
rename from tests/unit-tests/management/test-nfd-fib-entry.cpp
rename to tests/unit-tests/management/nfd-fib-entry.t.cpp
index 5b7d20b..05459f3 100644
--- a/tests/unit-tests/management/test-nfd-fib-entry.cpp
+++ b/tests/unit-tests/management/nfd-fib-entry.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdFibEntry)
+BOOST_AUTO_TEST_SUITE(ManagementNfdFibEntry)
 
 const uint8_t TestNextHopRecord[] =
 {
@@ -150,5 +151,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-forwarder-status.cpp b/tests/unit-tests/management/nfd-forwarder-status.t.cpp
similarity index 95%
rename from tests/unit-tests/management/test-nfd-forwarder-status.cpp
rename to tests/unit-tests/management/nfd-forwarder-status.t.cpp
index 0255f3c..c313791 100644
--- a/tests/unit-tests/management/test-nfd-forwarder-status.cpp
+++ b/tests/unit-tests/management/nfd-forwarder-status.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -26,8 +26,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdForwarderStatus)
+BOOST_AUTO_TEST_SUITE(ManagementNfdForwarderStatus)
 
 BOOST_AUTO_TEST_CASE(Encode)
 {
@@ -87,5 +88,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-rib-entry.cpp b/tests/unit-tests/management/nfd-rib-entry.t.cpp
similarity index 98%
rename from tests/unit-tests/management/test-nfd-rib-entry.cpp
rename to tests/unit-tests/management/nfd-rib-entry.t.cpp
index 858598f..4018386 100644
--- a/tests/unit-tests/management/test-nfd-rib-entry.cpp
+++ b/tests/unit-tests/management/nfd-rib-entry.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -26,8 +26,9 @@
 
 namespace ndn {
 namespace nfd {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdRibEntry)
+BOOST_AUTO_TEST_SUITE(ManagementNfdRibEntry)
 
 const uint8_t RouteData[] =
 {
@@ -337,5 +338,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace nfd
 } // namespace ndn
diff --git a/tests/unit-tests/management/test-nfd-strategy-choice.cpp b/tests/unit-tests/management/nfd-strategy-choice.t.cpp
similarity index 95%
rename from tests/unit-tests/management/test-nfd-strategy-choice.cpp
rename to tests/unit-tests/management/nfd-strategy-choice.t.cpp
index d19c2c8..38290fa 100644
--- a/tests/unit-tests/management/test-nfd-strategy-choice.cpp
+++ b/tests/unit-tests/management/nfd-strategy-choice.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -27,7 +27,7 @@
 namespace nfd {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(ManagementTestNfdStrategyChoice)
+BOOST_AUTO_TEST_SUITE(ManagementNfdStrategyChoice)
 
 BOOST_AUTO_TEST_CASE(Encode)
 {