diff --git a/tests/unit-tests/transport/test-tcp-transport.cpp b/tests/unit-tests/transport/tcp-transport.t.cpp
similarity index 95%
rename from tests/unit-tests/transport/test-tcp-transport.cpp
rename to tests/unit-tests/transport/tcp-transport.t.cpp
index 7c646d8..c8aa461 100644
--- a/tests/unit-tests/transport/test-tcp-transport.cpp
+++ b/tests/unit-tests/transport/tcp-transport.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,10 +25,9 @@
 #include "boost-test.hpp"
 
 namespace ndn {
+namespace tests {
 
-
-
-BOOST_FIXTURE_TEST_SUITE(TransportTestTcpTransport, TransportFixture)
+BOOST_FIXTURE_TEST_SUITE(TransportTcpTransport, TransportFixture)
 
 BOOST_AUTO_TEST_CASE(GetDefaultSocketNameOk)
 {
@@ -101,4 +100,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn
diff --git a/tests/unit-tests/transport/test-unix-transport.cpp b/tests/unit-tests/transport/unix-transport.t.cpp
similarity index 96%
rename from tests/unit-tests/transport/test-unix-transport.cpp
rename to tests/unit-tests/transport/unix-transport.t.cpp
index 7bfebe9..83ae2b0 100644
--- a/tests/unit-tests/transport/test-unix-transport.cpp
+++ b/tests/unit-tests/transport/unix-transport.t.cpp
@@ -25,8 +25,9 @@
 #include "boost-test.hpp"
 
 namespace ndn {
+namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(TransportTestUnixTransport, TransportFixture)
+BOOST_FIXTURE_TEST_SUITE(TransportUnixTransport, TransportFixture)
 
 BOOST_AUTO_TEST_CASE(GetDefaultSocketNameOk)
 {
@@ -78,4 +79,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn