diff --git a/tests/daemon/face/ethernet.cpp b/tests/daemon/face/ethernet.t.cpp
similarity index 100%
rename from tests/daemon/face/ethernet.cpp
rename to tests/daemon/face/ethernet.t.cpp
diff --git a/tests/daemon/face/face-counters.cpp b/tests/daemon/face/face-counters.t.cpp
similarity index 82%
rename from tests/daemon/face/face-counters.cpp
rename to tests/daemon/face/face-counters.t.cpp
index 3be0d88..2d56113 100644
--- a/tests/daemon/face/face-counters.cpp
+++ b/tests/daemon/face/face-counters.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 "face/face-counters.hpp"
 #include "dummy-face.hpp"
diff --git a/tests/daemon/face/face.cpp b/tests/daemon/face/face.t.cpp
similarity index 100%
rename from tests/daemon/face/face.cpp
rename to tests/daemon/face/face.t.cpp
diff --git a/tests/daemon/face/ndnlp.cpp b/tests/daemon/face/ndnlp.t.cpp
similarity index 98%
rename from tests/daemon/face/ndnlp.cpp
rename to tests/daemon/face/ndnlp.t.cpp
index 52091d3..bf6edea 100644
--- a/tests/daemon/face/ndnlp.cpp
+++ b/tests/daemon/face/ndnlp.t.cpp
@@ -32,8 +32,11 @@
 #include <boost/scoped_array.hpp>
 
 namespace nfd {
+namespace ndnlp {
 namespace tests {
 
+using namespace nfd::tests;
+
 BOOST_FIXTURE_TEST_SUITE(FaceNdnlp, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(SequenceBlock)
@@ -289,4 +292,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace ndnlp
 } // namespace nfd
diff --git a/tests/daemon/face/null.cpp b/tests/daemon/face/null-face.t.cpp
similarity index 73%
rename from tests/daemon/face/null.cpp
rename to tests/daemon/face/null-face.t.cpp
index db90410..83dfbf4 100644
--- a/tests/daemon/face/null.cpp
+++ b/tests/daemon/face/null-face.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 @@
 namespace nfd {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(FaceNull, BaseFixture)
+BOOST_FIXTURE_TEST_SUITE(FaceNullFace, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(Send)
 {
diff --git a/tests/daemon/face/tcp.cpp b/tests/daemon/face/tcp.t.cpp
similarity index 100%
rename from tests/daemon/face/tcp.cpp
rename to tests/daemon/face/tcp.t.cpp
diff --git a/tests/daemon/face/udp.cpp b/tests/daemon/face/udp.t.cpp
similarity index 100%
rename from tests/daemon/face/udp.cpp
rename to tests/daemon/face/udp.t.cpp
diff --git a/tests/daemon/face/unix-stream.cpp b/tests/daemon/face/unix-stream.t.cpp
similarity index 100%
rename from tests/daemon/face/unix-stream.cpp
rename to tests/daemon/face/unix-stream.t.cpp
diff --git a/tests/daemon/face/websocket.cpp b/tests/daemon/face/websocket.t.cpp
similarity index 100%
rename from tests/daemon/face/websocket.cpp
rename to tests/daemon/face/websocket.t.cpp