diff --git a/tests/daemon/fw/access-strategy.cpp b/tests/daemon/fw/access-strategy.t.cpp
similarity index 99%
rename from tests/daemon/fw/access-strategy.cpp
rename to tests/daemon/fw/access-strategy.t.cpp
index 934dfcd..732e0e8 100644
--- a/tests/daemon/fw/access-strategy.cpp
+++ b/tests/daemon/fw/access-strategy.t.cpp
@@ -29,8 +29,11 @@
 #include "topology-tester.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 // This test suite tests AccessStrategy's behavior as a black box,
 // without accessing its internals.
 //
@@ -350,4 +353,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/best-route-strategy2.cpp b/tests/daemon/fw/best-route-strategy2.t.cpp
similarity index 98%
rename from tests/daemon/fw/best-route-strategy2.cpp
rename to tests/daemon/fw/best-route-strategy2.t.cpp
index 5357bc8..385e774 100644
--- a/tests/daemon/fw/best-route-strategy2.cpp
+++ b/tests/daemon/fw/best-route-strategy2.t.cpp
@@ -30,8 +30,11 @@
 #include "tests/daemon/face/dummy-face.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FwBestRouteStrategy2, UnitTestTimeFixture)
 
 BOOST_AUTO_TEST_CASE(Forward)
@@ -129,4 +132,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/broadcast-strategy.cpp b/tests/daemon/fw/broadcast-strategy.t.cpp
similarity index 89%
rename from tests/daemon/fw/broadcast-strategy.cpp
rename to tests/daemon/fw/broadcast-strategy.t.cpp
index cde9b44..ad47daa 100644
--- a/tests/daemon/fw/broadcast-strategy.cpp
+++ b/tests/daemon/fw/broadcast-strategy.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 "fw/broadcast-strategy.hpp"
 #include "strategy-tester.hpp"
@@ -29,8 +30,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FwBroadcastStrategy, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(Forward2)
@@ -126,4 +130,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/client-control-strategy.cpp b/tests/daemon/fw/client-control-strategy.t.cpp
similarity index 87%
rename from tests/daemon/fw/client-control-strategy.cpp
rename to tests/daemon/fw/client-control-strategy.t.cpp
index c76fb52..ee3a362 100644
--- a/tests/daemon/fw/client-control-strategy.cpp
+++ b/tests/daemon/fw/client-control-strategy.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 "fw/client-control-strategy.hpp"
 #include "strategy-tester.hpp"
@@ -29,8 +30,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FwClientControlStrategy, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(Forward3)
@@ -93,4 +97,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/face-table.cpp b/tests/daemon/fw/face-table.t.cpp
similarity index 90%
rename from tests/daemon/fw/face-table.cpp
rename to tests/daemon/fw/face-table.t.cpp
index b2bfab4..6610034 100644
--- a/tests/daemon/fw/face-table.cpp
+++ b/tests/daemon/fw/face-table.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.
diff --git a/tests/daemon/fw/forwarder.cpp b/tests/daemon/fw/forwarder.t.cpp
similarity index 100%
rename from tests/daemon/fw/forwarder.cpp
rename to tests/daemon/fw/forwarder.t.cpp
diff --git a/tests/daemon/fw/ncc-strategy.cpp b/tests/daemon/fw/ncc-strategy.t.cpp
similarity index 99%
rename from tests/daemon/fw/ncc-strategy.cpp
rename to tests/daemon/fw/ncc-strategy.t.cpp
index da70e86..a10fc47 100644
--- a/tests/daemon/fw/ncc-strategy.cpp
+++ b/tests/daemon/fw/ncc-strategy.t.cpp
@@ -31,8 +31,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FwNccStrategy, UnitTestTimeFixture)
 
 // NccStrategy is fairly complex.
@@ -310,4 +313,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/retx-suppression.cpp b/tests/daemon/fw/retx-suppression.t.cpp
similarity index 98%
rename from tests/daemon/fw/retx-suppression.cpp
rename to tests/daemon/fw/retx-suppression.t.cpp
index bec696f..2d1b146 100644
--- a/tests/daemon/fw/retx-suppression.cpp
+++ b/tests/daemon/fw/retx-suppression.t.cpp
@@ -32,11 +32,10 @@
 #include "tests/daemon/face/dummy-face.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
-using fw::RetxSuppression;
-using fw::RetxSuppressionFixed;
-using fw::RetxSuppressionExponential;
+using namespace nfd::tests;
 
 BOOST_FIXTURE_TEST_SUITE(FwRetxSuppression, UnitTestTimeFixture)
 
@@ -160,4 +159,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/rtt-estimator.cpp b/tests/daemon/fw/rtt-estimator.t.cpp
similarity index 82%
rename from tests/daemon/fw/rtt-estimator.cpp
rename to tests/daemon/fw/rtt-estimator.t.cpp
index b5af0ab..1a19443 100644
--- a/tests/daemon/fw/rtt-estimator.cpp
+++ b/tests/daemon/fw/rtt-estimator.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.
@@ -21,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 "fw/rtt-estimator.hpp"
 
diff --git a/tests/daemon/fw/strategy-tester.hpp b/tests/daemon/fw/strategy-tester.hpp
index 980144d..9cf4855 100644
--- a/tests/daemon/fw/strategy-tester.hpp
+++ b/tests/daemon/fw/strategy-tester.hpp
@@ -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,6 +30,7 @@
 #include "fw/strategy.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
 /** \class StrategyTester
@@ -88,6 +89,7 @@
 }
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
 
 #endif // NFD_TESTS_NFD_FW_STRATEGY_TESTER_HPP
diff --git a/tests/daemon/fw/strategy.cpp b/tests/daemon/fw/strategy.t.cpp
similarity index 83%
rename from tests/daemon/fw/strategy.cpp
rename to tests/daemon/fw/strategy.t.cpp
index 066b280..44fead2 100644
--- a/tests/daemon/fw/strategy.cpp
+++ b/tests/daemon/fw/strategy.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.
@@ -31,8 +31,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FwStrategy, BaseFixture)
 
 class FaceTableAccessTestStrategy : public DummyStrategy
@@ -94,4 +97,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
diff --git a/tests/daemon/fw/topology-tester.hpp b/tests/daemon/fw/topology-tester.hpp
index f343738..16a1173 100644
--- a/tests/daemon/fw/topology-tester.hpp
+++ b/tests/daemon/fw/topology-tester.hpp
@@ -37,9 +37,11 @@
 #include "../face/dummy-face.hpp"
 
 namespace nfd {
+namespace fw {
 namespace tests {
 
 using ndn::util::DummyClientFace;
+using namespace nfd::tests;
 
 /** \brief identifies a node (forwarder) in the topology
  */
@@ -361,6 +363,7 @@
 };
 
 } // namespace tests
+} // namespace fw
 } // namespace nfd
 
 #endif // NFD_TESTS_NFD_FW_TOPOLOGY_TESTER_HPP