diff --git a/tests/daemon/table/cs.cpp b/tests/daemon/table/cs.t.cpp
similarity index 99%
rename from tests/daemon/table/cs.cpp
rename to tests/daemon/table/cs.t.cpp
index e9efddf..6d69eda 100644
--- a/tests/daemon/table/cs.cpp
+++ b/tests/daemon/table/cs.t.cpp
@@ -29,8 +29,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace cs {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(TableCs, BaseFixture)
 
 class FindFixture : protected BaseFixture
@@ -436,4 +439,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace cs
 } // namespace nfd
diff --git a/tests/daemon/table/dead-nonce-list.cpp b/tests/daemon/table/dead-nonce-list.t.cpp
similarity index 100%
rename from tests/daemon/table/dead-nonce-list.cpp
rename to tests/daemon/table/dead-nonce-list.t.cpp
diff --git a/tests/daemon/table/fib.cpp b/tests/daemon/table/fib.t.cpp
similarity index 96%
rename from tests/daemon/table/fib.cpp
rename to tests/daemon/table/fib.t.cpp
index d75088b..59a88e9 100644
--- a/tests/daemon/table/fib.cpp
+++ b/tests/daemon/table/fib.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/table/measurements-accessor.cpp b/tests/daemon/table/measurements-accessor.t.cpp
similarity index 100%
rename from tests/daemon/table/measurements-accessor.cpp
rename to tests/daemon/table/measurements-accessor.t.cpp
diff --git a/tests/daemon/table/measurements.cpp b/tests/daemon/table/measurements.t.cpp
similarity index 100%
rename from tests/daemon/table/measurements.cpp
rename to tests/daemon/table/measurements.t.cpp
diff --git a/tests/daemon/table/name-tree.cpp b/tests/daemon/table/name-tree.t.cpp
similarity index 96%
rename from tests/daemon/table/name-tree.cpp
rename to tests/daemon/table/name-tree.t.cpp
index 9790596..de7ecbb 100644
--- a/tests/daemon/table/name-tree.cpp
+++ b/tests/daemon/table/name-tree.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/table/pit.cpp b/tests/daemon/table/pit.t.cpp
similarity index 99%
rename from tests/daemon/table/pit.cpp
rename to tests/daemon/table/pit.t.cpp
index 5de6fe3..7bd89fc 100644
--- a/tests/daemon/table/pit.cpp
+++ b/tests/daemon/table/pit.t.cpp
@@ -29,8 +29,11 @@
 #include "tests/test-common.hpp"
 
 namespace nfd {
+namespace pit {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(TablePit, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(EntryInOutRecords)
@@ -495,4 +498,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace pit
 } // namespace nfd
diff --git a/tests/daemon/table/strategy-choice.cpp b/tests/daemon/table/strategy-choice.t.cpp
similarity index 95%
rename from tests/daemon/table/strategy-choice.cpp
rename to tests/daemon/table/strategy-choice.t.cpp
index 494c76b..ec450f5 100644
--- a/tests/daemon/table/strategy-choice.cpp
+++ b/tests/daemon/table/strategy-choice.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/table/strategy-info-host.cpp b/tests/daemon/table/strategy-info-host.t.cpp
similarity index 89%
rename from tests/daemon/table/strategy-info-host.cpp
rename to tests/daemon/table/strategy-info-host.t.cpp
index 5c0c14f..746d51a 100644
--- a/tests/daemon/table/strategy-info-host.cpp
+++ b/tests/daemon/table/strategy-info-host.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.