diff --git a/tests/unit-tests/util/concepts.cpp b/tests/unit-tests/util/concepts.t.cpp
similarity index 77%
rename from tests/unit-tests/util/concepts.cpp
rename to tests/unit-tests/util/concepts.t.cpp
index 0486013..522e737 100644
--- a/tests/unit-tests/util/concepts.cpp
+++ b/tests/unit-tests/util/concepts.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) 2013-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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/test-config-file.cpp b/tests/unit-tests/util/config-file.t.cpp
similarity index 94%
rename from tests/unit-tests/util/test-config-file.cpp
rename to tests/unit-tests/util/config-file.t.cpp
index 2f6650e..af03156 100644
--- a/tests/unit-tests/util/test-config-file.cpp
+++ b/tests/unit-tests/util/config-file.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).
  *
@@ -29,7 +29,7 @@
 namespace ndn {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(UtilTestConfigFile, util::TestHomeEnvironmentFixture)
+BOOST_FIXTURE_TEST_SUITE(UtilConfigFile, util::TestHomeEnvironmentFixture)
 
 BOOST_AUTO_TEST_CASE(TestParse)
 {
diff --git a/tests/unit-tests/util/test-digest.cpp b/tests/unit-tests/util/digest.t.cpp
similarity index 98%
rename from tests/unit-tests/util/test-digest.cpp
rename to tests/unit-tests/util/digest.t.cpp
index 6a43067..252a0e7 100644
--- a/tests/unit-tests/util/test-digest.cpp
+++ b/tests/unit-tests/util/digest.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).
  *
@@ -28,7 +28,7 @@
 namespace util {
 namespace test {
 
-BOOST_AUTO_TEST_SUITE(UtilTestDigest)
+BOOST_AUTO_TEST_SUITE(UtilDigest)
 
 BOOST_AUTO_TEST_CASE(Sha256Digest)
 {
diff --git a/tests/unit-tests/util/test-dns.cpp b/tests/unit-tests/util/dns.t.cpp
similarity index 100%
rename from tests/unit-tests/util/test-dns.cpp
rename to tests/unit-tests/util/dns.t.cpp
diff --git a/tests/unit-tests/util/ethernet.cpp b/tests/unit-tests/util/ethernet.t.cpp
similarity index 88%
rename from tests/unit-tests/util/ethernet.cpp
rename to tests/unit-tests/util/ethernet.t.cpp
index 35c0dee..9b7aa35 100644
--- a/tests/unit-tests/util/ethernet.cpp
+++ b/tests/unit-tests/util/ethernet.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) 2013-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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -31,8 +31,9 @@
 
 namespace ndn {
 namespace util {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(UtilTestEthernet)
+BOOST_AUTO_TEST_SUITE(UtilEthernet)
 
 BOOST_AUTO_TEST_CASE(BasicChecks)
 {
@@ -111,5 +112,6 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace util
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-event-emitter.cpp b/tests/unit-tests/util/event-emitter.t.cpp
similarity index 78%
rename from tests/unit-tests/util/test-event-emitter.cpp
rename to tests/unit-tests/util/event-emitter.t.cpp
index 8dd5314..b429dbf 100644
--- a/tests/unit-tests/util/test-event-emitter.cpp
+++ b/tests/unit-tests/util/event-emitter.t.cpp
@@ -1,6 +1,11 @@
 /* -*- 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,
+ *                         Arizona Board of Regents,
+ *                         Colorado State University,
+ *                         University Pierre & Marie Curie, Sorbonne University,
+ *                         Washington University in St. Louis,
+ *                         Beijing Institute of Technology
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -17,42 +22,16 @@
  * <http://www.gnu.org/licenses/>.
  *
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
- *
- * This code is actually copied from NFD project (NDN Forwarding Daemon).
- * We acknowledge the permission of the authors of NFD.
  */
-/**
- * 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
- *
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
- *
- * NFD is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- *
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * 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 "util/event-emitter.hpp"
 
 #include "boost-test.hpp"
 
 namespace ndn {
+namespace util {
 namespace tests {
 
-using ndn::util::EventEmitter;
-
 BOOST_AUTO_TEST_SUITE(UtilEventEmitter)
 
 class EventEmitterTester : noncopyable
@@ -272,4 +251,5 @@
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests
+} // namespace util
 } // namespace ndn
diff --git a/tests/unit-tests/util/face-uri.cpp b/tests/unit-tests/util/face-uri.t.cpp
similarity index 96%
rename from tests/unit-tests/util/face-uri.cpp
rename to tests/unit-tests/util/face-uri.t.cpp
index 39353be..5ae5e28 100644
--- a/tests/unit-tests/util/face-uri.cpp
+++ b/tests/unit-tests/util/face-uri.t.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * 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.
+ * Copyright (c) 2013-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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -36,7 +36,7 @@
 
 using ndn::tests::NetworkConfigurationDetector;
 
-BOOST_AUTO_TEST_SUITE(UtilTestFaceUri)
+BOOST_AUTO_TEST_SUITE(UtilFaceUri)
 
 class CanonizeFixture : noncopyable
 {
diff --git a/tests/unit-tests/util/test-in-memory-storage-fifo.cpp b/tests/unit-tests/util/in-memory-storage-fifo.t.cpp
similarity index 93%
rename from tests/unit-tests/util/test-in-memory-storage-fifo.cpp
rename to tests/unit-tests/util/in-memory-storage-fifo.t.cpp
index 9a7a13b..f090169 100644
--- a/tests/unit-tests/util/test-in-memory-storage-fifo.cpp
+++ b/tests/unit-tests/util/in-memory-storage-fifo.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).
  *
@@ -23,10 +23,11 @@
 #include "security/key-chain.hpp"
 
 #include "boost-test.hpp"
-#include "../test-make-interest-data.hpp"
+#include "../make-interest-data.hpp"
 
 namespace ndn {
 namespace util {
+namespace tests {
 
 BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
 BOOST_AUTO_TEST_SUITE(Fifo)
@@ -75,5 +76,6 @@
 BOOST_AUTO_TEST_SUITE_END() // Fifo
 BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
 
+} // namespace tests
 } // namespace util
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-lfu.cpp b/tests/unit-tests/util/in-memory-storage-lfu.t.cpp
similarity index 96%
rename from tests/unit-tests/util/test-in-memory-storage-lfu.cpp
rename to tests/unit-tests/util/in-memory-storage-lfu.t.cpp
index 428d2e3..b8d08c6 100644
--- a/tests/unit-tests/util/test-in-memory-storage-lfu.cpp
+++ b/tests/unit-tests/util/in-memory-storage-lfu.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).
  *
@@ -23,10 +23,11 @@
 #include "security/key-chain.hpp"
 
 #include "boost-test.hpp"
-#include "../test-make-interest-data.hpp"
+#include "../make-interest-data.hpp"
 
 namespace ndn {
 namespace util {
+namespace tests {
 
 BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
 BOOST_AUTO_TEST_SUITE(Lfu)
@@ -130,5 +131,6 @@
 BOOST_AUTO_TEST_SUITE_END() // Lfu
 BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
 
+} // namespace tests
 } // namesapce util
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-lru.cpp b/tests/unit-tests/util/in-memory-storage-lru.t.cpp
similarity index 96%
rename from tests/unit-tests/util/test-in-memory-storage-lru.cpp
rename to tests/unit-tests/util/in-memory-storage-lru.t.cpp
index d91f7ad..1cbffb8 100644
--- a/tests/unit-tests/util/test-in-memory-storage-lru.cpp
+++ b/tests/unit-tests/util/in-memory-storage-lru.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).
  *
@@ -23,10 +23,11 @@
 #include "security/key-chain.hpp"
 
 #include "boost-test.hpp"
-#include "../test-make-interest-data.hpp"
+#include "../make-interest-data.hpp"
 
 namespace ndn {
 namespace util {
+namespace tests {
 
 BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
 BOOST_AUTO_TEST_SUITE(Lru)
@@ -132,5 +133,6 @@
 BOOST_AUTO_TEST_SUITE_END() // Lru
 BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
 
+} // namespace tests
 } // namespace util
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-in-memory-storage-persistent.cpp b/tests/unit-tests/util/in-memory-storage-persistent.t.cpp
similarity index 92%
rename from tests/unit-tests/util/test-in-memory-storage-persistent.cpp
rename to tests/unit-tests/util/in-memory-storage-persistent.t.cpp
index 3da691f..1734774 100644
--- a/tests/unit-tests/util/test-in-memory-storage-persistent.cpp
+++ b/tests/unit-tests/util/in-memory-storage-persistent.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).
  *
@@ -23,10 +23,11 @@
 #include "security/key-chain.hpp"
 
 #include "boost-test.hpp"
-#include "../test-make-interest-data.hpp"
+#include "../make-interest-data.hpp"
 
 namespace ndn {
 namespace util {
+namespace tests {
 
 BOOST_AUTO_TEST_SUITE(UtilInMemoryStorage)
 BOOST_AUTO_TEST_SUITE(Persistent)
@@ -60,5 +61,6 @@
 BOOST_AUTO_TEST_SUITE_END() // Persistent
 BOOST_AUTO_TEST_SUITE_END() // UtilInMemoryStorage
 
+} // namespace tests
 } // namespace util
 } // namespace ndn
diff --git a/tests/unit-tests/util/indented-stream.cpp b/tests/unit-tests/util/indented-stream.t.cpp
similarity index 96%
rename from tests/unit-tests/util/indented-stream.cpp
rename to tests/unit-tests/util/indented-stream.t.cpp
index d82e9f3..30d2e07 100644
--- a/tests/unit-tests/util/indented-stream.cpp
+++ b/tests/unit-tests/util/indented-stream.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).
  *
diff --git a/tests/unit-tests/util/test-io.cpp b/tests/unit-tests/util/io.t.cpp
similarity index 94%
rename from tests/unit-tests/util/test-io.cpp
rename to tests/unit-tests/util/io.t.cpp
index 0a3e422..d69123e 100644
--- a/tests/unit-tests/util/test-io.cpp
+++ b/tests/unit-tests/util/io.t.cpp
@@ -26,8 +26,9 @@
 #include "boost-test.hpp"
 
 namespace ndn {
+namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(UtilTestIo, security::IdentityManagementFixture)
+BOOST_FIXTURE_TEST_SUITE(UtilIo, security::IdentityManagementFixture)
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
@@ -48,4 +49,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn
diff --git a/tests/unit-tests/util/notification-stream.cpp b/tests/unit-tests/util/notification-stream.t.cpp
similarity index 97%
rename from tests/unit-tests/util/notification-stream.cpp
rename to tests/unit-tests/util/notification-stream.t.cpp
index 4b6d43d..fb91f5e 100644
--- a/tests/unit-tests/util/notification-stream.cpp
+++ b/tests/unit-tests/util/notification-stream.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).
  *
diff --git a/tests/unit-tests/util/notification-subscriber.cpp b/tests/unit-tests/util/notification-subscriber.t.cpp
similarity index 84%
rename from tests/unit-tests/util/notification-subscriber.cpp
rename to tests/unit-tests/util/notification-subscriber.t.cpp
index 643daf0..4fa222b 100644
--- a/tests/unit-tests/util/notification-subscriber.cpp
+++ b/tests/unit-tests/util/notification-subscriber.t.cpp
@@ -1,6 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2015 Regents of the University of California.
+ * Copyright (c) 2013-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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,32 +25,6 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-/**
- * Original copyright notice from NFD:
- *
- * 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
- *
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
- *
- * NFD is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- *
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * 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 "util/notification-subscriber.hpp"
 #include "util/notification-stream.hpp"
 #include "simple-notification.hpp"
diff --git a/tests/unit-tests/util/placeholders.cpp b/tests/unit-tests/util/placeholders.t.cpp
similarity index 95%
rename from tests/unit-tests/util/placeholders.cpp
rename to tests/unit-tests/util/placeholders.t.cpp
index 2138f48..032b088 100644
--- a/tests/unit-tests/util/placeholders.cpp
+++ b/tests/unit-tests/util/placeholders.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).
  *
diff --git a/tests/unit-tests/util/placeholders2.cpp b/tests/unit-tests/util/placeholders2.t.cpp
similarity index 94%
rename from tests/unit-tests/util/placeholders2.cpp
rename to tests/unit-tests/util/placeholders2.t.cpp
index c0f11b6..ada739a 100644
--- a/tests/unit-tests/util/placeholders2.cpp
+++ b/tests/unit-tests/util/placeholders2.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).
  *
diff --git a/tests/unit-tests/util/test-random.cpp b/tests/unit-tests/util/random.t.cpp
similarity index 94%
rename from tests/unit-tests/util/test-random.cpp
rename to tests/unit-tests/util/random.t.cpp
index 26ac8ce..d56d84b 100644
--- a/tests/unit-tests/util/test-random.cpp
+++ b/tests/unit-tests/util/random.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,8 +27,9 @@
 #include <cmath>
 
 namespace ndn {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(UtilTestRandom)
+BOOST_AUTO_TEST_SUITE(UtilRandom)
 
 class PseudoRandomWord32
 {
@@ -108,4 +109,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-regex.cpp b/tests/unit-tests/util/regex.t.cpp
similarity index 98%
rename from tests/unit-tests/util/test-regex.cpp
rename to tests/unit-tests/util/regex.t.cpp
index 81630d1..e7cdea5 100644
--- a/tests/unit-tests/util/test-regex.cpp
+++ b/tests/unit-tests/util/regex.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).
  *
@@ -32,10 +32,12 @@
 
 #include "boost-test.hpp"
 
-using namespace std;
 namespace ndn {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(UtilTestRegex)
+using std::string;
+
+BOOST_AUTO_TEST_SUITE(UtilRegex)
 
 BOOST_AUTO_TEST_CASE(ComponentMatcher)
 {
@@ -464,4 +466,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn
diff --git a/tests/unit-tests/util/test-scheduler.cpp b/tests/unit-tests/util/scheduler.t.cpp
similarity index 96%
rename from tests/unit-tests/util/test-scheduler.cpp
rename to tests/unit-tests/util/scheduler.t.cpp
index 3b8feb0..8e22f1e 100644
--- a/tests/unit-tests/util/test-scheduler.cpp
+++ b/tests/unit-tests/util/scheduler.t.cpp
@@ -30,7 +30,9 @@
 namespace scheduler {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(UtilTestScheduler, ::ndn::tests::UnitTestTimeFixture)
+using namespace ndn::tests;
+
+BOOST_FIXTURE_TEST_SUITE(UtilScheduler, UnitTestTimeFixture)
 
 BOOST_AUTO_TEST_CASE(Events)
 {
@@ -83,7 +85,7 @@
   BOOST_REQUIRE_NO_THROW(advanceClocks(time::milliseconds(100), 10));
 }
 
-class SelfRescheduleFixture : public ::ndn::tests::UnitTestTimeFixture
+class SelfRescheduleFixture : public UnitTestTimeFixture
 {
 public:
   SelfRescheduleFixture()
@@ -203,7 +205,7 @@
   BOOST_CHECK_EQUAL(count, 0);
 }
 
-class ScopedEventFixture : public ::ndn::tests::UnitTestTimeFixture
+class ScopedEventFixture : public UnitTestTimeFixture
 {
 public:
   ScopedEventFixture()
diff --git a/tests/unit-tests/util/segment-fetcher.cpp b/tests/unit-tests/util/segment-fetcher.t.cpp
similarity index 100%
rename from tests/unit-tests/util/segment-fetcher.cpp
rename to tests/unit-tests/util/segment-fetcher.t.cpp
diff --git a/tests/unit-tests/util/signal.cpp b/tests/unit-tests/util/signal.t.cpp
similarity index 100%
rename from tests/unit-tests/util/signal.cpp
rename to tests/unit-tests/util/signal.t.cpp
diff --git a/tests/unit-tests/util/test-in-memory-storage-common.cpp b/tests/unit-tests/util/test-in-memory-storage-common.cpp
index 303391e..5fe9805 100644
--- a/tests/unit-tests/util/test-in-memory-storage-common.cpp
+++ b/tests/unit-tests/util/test-in-memory-storage-common.cpp
@@ -26,7 +26,7 @@
 #include "security/key-chain.hpp"
 
 #include "boost-test.hpp"
-#include "../test-make-interest-data.hpp"
+#include "../make-interest-data.hpp"
 
 #include <boost/mpl/list.hpp>
 
diff --git a/tests/unit-tests/util/test-time-unit-test-clock.cpp b/tests/unit-tests/util/time-unit-test-clock.t.cpp
similarity index 97%
rename from tests/unit-tests/util/test-time-unit-test-clock.cpp
rename to tests/unit-tests/util/time-unit-test-clock.t.cpp
index e43d4ed..658f043 100644
--- a/tests/unit-tests/util/test-time-unit-test-clock.cpp
+++ b/tests/unit-tests/util/time-unit-test-clock.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).
  *
@@ -29,7 +29,7 @@
 namespace ndn {
 namespace tests {
 
-BOOST_AUTO_TEST_SUITE(UtilTestTimeUnitTestClock)
+BOOST_AUTO_TEST_SUITE(UtilTimeUnitTestClock)
 
 class UnitTestTimeFixture
 {
diff --git a/tests/unit-tests/util/test-time.cpp b/tests/unit-tests/util/time.t.cpp
similarity index 95%
rename from tests/unit-tests/util/test-time.cpp
rename to tests/unit-tests/util/time.t.cpp
index d3a659c..c4ac260 100644
--- a/tests/unit-tests/util/test-time.cpp
+++ b/tests/unit-tests/util/time.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).
  *
@@ -24,8 +24,9 @@
 #include "boost-test.hpp"
 
 namespace ndn {
+namespace tests {
 
-BOOST_AUTO_TEST_SUITE(UtilTestTime)
+BOOST_AUTO_TEST_SUITE(UtilTime)
 
 BOOST_AUTO_TEST_CASE(SystemClock)
 {
@@ -74,4 +75,5 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
+} // namespace tests
 } // namespace ndn