diff --git a/tests/unit/util/backports.t.cpp b/tests/unit/util/backports.t.cpp
index 7a124e0..6ff2c4c 100644
--- a/tests/unit/util/backports.t.cpp
+++ b/tests/unit/util/backports.t.cpp
@@ -19,10 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/backports.hpp"
+#include "ndn-cxx/util/backports.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <numeric>
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/concepts.t.cpp b/tests/unit/util/concepts.t.cpp
index 3141ec5..997f86a 100644
--- a/tests/unit/util/concepts.t.cpp
+++ b/tests/unit/util/concepts.t.cpp
@@ -25,7 +25,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/concepts.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/config-file.t.cpp b/tests/unit/util/config-file.t.cpp
index 658018b..78b80be 100644
--- a/tests/unit/util/config-file.t.cpp
+++ b/tests/unit/util/config-file.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/config-file.hpp"
-#include "../test-home-env-saver.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/test-home-env-saver.hpp"
 
 #include <cstdlib>
 
diff --git a/tests/unit/util/dummy-client-face.t.cpp b/tests/unit/util/dummy-client-face.t.cpp
index aed8cd6..acd6297 100644
--- a/tests/unit/util/dummy-client-face.t.cpp
+++ b/tests/unit/util/dummy-client-face.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-time-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/indented-stream.t.cpp b/tests/unit/util/indented-stream.t.cpp
index e450c4a..b3edaf8 100644
--- a/tests/unit/util/indented-stream.t.cpp
+++ b/tests/unit/util/indented-stream.t.cpp
@@ -19,9 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/indented-stream.hpp"
+#include "ndn-cxx/util/indented-stream.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/io.t.cpp b/tests/unit/util/io.t.cpp
index 1b46bca..052e149 100644
--- a/tests/unit/util/io.t.cpp
+++ b/tests/unit/util/io.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/io.hpp"
+#include "ndn-cxx/util/io.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 #include <boost/filesystem.hpp>
 
diff --git a/tests/unit/util/log-filter-module.cpp b/tests/unit/util/log-filter-module.cpp
index cf3b628..ab55728 100644
--- a/tests/unit/util/log-filter-module.cpp
+++ b/tests/unit/util/log-filter-module.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(fm.FilterModule);
 
diff --git a/tests/unit/util/log-module1.cpp b/tests/unit/util/log-module1.cpp
index 2099a75..4f71102 100644
--- a/tests/unit/util/log-module1.cpp
+++ b/tests/unit/util/log-module1.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(Module1);
 
diff --git a/tests/unit/util/log-module2.cpp b/tests/unit/util/log-module2.cpp
index 273165d..994e142 100644
--- a/tests/unit/util/log-module2.cpp
+++ b/tests/unit/util/log-module2.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(Module2);
 
diff --git a/tests/unit/util/logger.t.cpp b/tests/unit/util/logger.t.cpp
index cc48425..ad742bb 100644
--- a/tests/unit/util/logger.t.cpp
+++ b/tests/unit/util/logger.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
-#include "util/logging.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/logging.t.cpp b/tests/unit/util/logging.t.cpp
index b431a05..fd867d2 100644
--- a/tests/unit/util/logging.t.cpp
+++ b/tests/unit/util/logging.t.cpp
@@ -19,11 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logging.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
-#include "../unit-test-time-fixture.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
+
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/notification-stream.t.cpp b/tests/unit/util/notification-stream.t.cpp
index 3721091..ada10c5 100644
--- a/tests/unit/util/notification-stream.t.cpp
+++ b/tests/unit/util/notification-stream.t.cpp
@@ -25,12 +25,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/notification-stream.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/notification-stream.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "simple-notification.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
+#include "tests/unit/util/simple-notification.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/notification-subscriber.t.cpp b/tests/unit/util/notification-subscriber.t.cpp
index 886e651..820532d 100644
--- a/tests/unit/util/notification-subscriber.t.cpp
+++ b/tests/unit/util/notification-subscriber.t.cpp
@@ -25,13 +25,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/notification-subscriber.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/notification-subscriber.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
-#include "simple-notification.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
+#include "tests/unit/util/simple-notification.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/placeholders.t.cpp b/tests/unit/util/placeholders.t.cpp
index 0dc8c70..16dece5 100644
--- a/tests/unit/util/placeholders.t.cpp
+++ b/tests/unit/util/placeholders.t.cpp
@@ -22,11 +22,11 @@
 // Bug 2109 test case
 
 // interest.hpp includes common.hpp; common.hpp shouldn't be used from external program
-#include "interest.hpp"
+#include "ndn-cxx/interest.hpp"
 
 // util/config-file.hpp indirectly includes <boost/property_tree/ptree.hpp>
 // which in turn imports Boost placeholders
-#include "util/config-file.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
 // It's intentional to write "using namespace",
 // to simulate an external program linked against ndn-cxx.
diff --git a/tests/unit/util/placeholders2.t.cpp b/tests/unit/util/placeholders2.t.cpp
index 187daa9..d8b8c93 100644
--- a/tests/unit/util/placeholders2.t.cpp
+++ b/tests/unit/util/placeholders2.t.cpp
@@ -22,7 +22,7 @@
 // Bug 2109 test case
 
 // interest.hpp includes common.hpp; common.hpp shouldn't be used from external program
-#include "interest.hpp"
+#include "ndn-cxx/interest.hpp"
 
 #include <boost/bind.hpp>
 
diff --git a/tests/unit/util/random.t.cpp b/tests/unit/util/random.t.cpp
index e830f7b..ee55f9e 100644
--- a/tests/unit/util/random.t.cpp
+++ b/tests/unit/util/random.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/random.hpp"
-#include "security/detail/openssl.hpp"
+#include "ndn-cxx/util/random.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/mpl/vector.hpp>
 #include <cmath>
diff --git a/tests/unit/util/regex.t.cpp b/tests/unit/util/regex.t.cpp
index 777defb..2804cc4 100644
--- a/tests/unit/util/regex.t.cpp
+++ b/tests/unit/util/regex.t.cpp
@@ -21,16 +21,16 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "util/regex.hpp"
-#include "util/regex/regex-backref-manager.hpp"
-#include "util/regex/regex-backref-matcher.hpp"
-#include "util/regex/regex-component-matcher.hpp"
-#include "util/regex/regex-component-set-matcher.hpp"
-#include "util/regex/regex-pattern-list-matcher.hpp"
-#include "util/regex/regex-repeat-matcher.hpp"
-#include "util/regex/regex-top-matcher.hpp"
+#include "ndn-cxx/util/regex.hpp"
+#include "ndn-cxx/util/regex/regex-backref-manager.hpp"
+#include "ndn-cxx/util/regex/regex-backref-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-set-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-repeat-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-top-matcher.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/scheduler.t.cpp b/tests/unit/util/scheduler.t.cpp
index 05380f3..5cd9f89 100644
--- a/tests/unit/util/scheduler.t.cpp
+++ b/tests/unit/util/scheduler.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/scheduler.hpp"
-#include "util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/util/segment-fetcher.t.cpp b/tests/unit/util/segment-fetcher.t.cpp
index d52fa08..22aa0b7 100644
--- a/tests/unit/util/segment-fetcher.t.cpp
+++ b/tests/unit/util/segment-fetcher.t.cpp
@@ -19,16 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/segment-fetcher.hpp"
+#include "ndn-cxx/util/segment-fetcher.hpp"
 
-#include "data.hpp"
-#include "lp/nack.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "dummy-validator.hpp"
-#include "make-interest-data.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/dummy-validator.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 #include <set>
 
diff --git a/tests/unit/util/sha256.t.cpp b/tests/unit/util/sha256.t.cpp
index 094f5f6..f6e0ec3 100644
--- a/tests/unit/util/sha256.t.cpp
+++ b/tests/unit/util/sha256.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/sha256.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/util/sha256.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/endian/conversion.hpp>
 #include <sstream>
diff --git a/tests/unit/util/signal.t.cpp b/tests/unit/util/signal.t.cpp
index c319f64..de22534 100644
--- a/tests/unit/util/signal.t.cpp
+++ b/tests/unit/util/signal.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/signal.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/simple-notification.hpp b/tests/unit/util/simple-notification.hpp
index 9e0d4ed..ac81f5f 100644
--- a/tests/unit/util/simple-notification.hpp
+++ b/tests/unit/util/simple-notification.hpp
@@ -25,12 +25,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
-#define NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
+#ifndef NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
+#define NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
 
-#include "common.hpp"
-
-#include "encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 namespace ndn {
 namespace util {
@@ -93,4 +91,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
+#endif // NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
diff --git a/tests/unit/util/sqlite3-statement.t.cpp b/tests/unit/util/sqlite3-statement.t.cpp
index 13171c5..c5ee8b6 100644
--- a/tests/unit/util/sqlite3-statement.t.cpp
+++ b/tests/unit/util/sqlite3-statement.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/sqlite3-statement.hpp"
+#include "ndn-cxx/util/sqlite3-statement.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/filesystem.hpp>
 #include <cstring>
diff --git a/tests/unit/util/string-helper.t.cpp b/tests/unit/util/string-helper.t.cpp
index 0456a35..ae89ba7 100644
--- a/tests/unit/util/string-helper.t.cpp
+++ b/tests/unit/util/string-helper.t.cpp
@@ -19,13 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/string-helper.hpp"
-#include "encoding/buffer.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <cctype>
 #include <cstring>
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/time-unit-test-clock.t.cpp b/tests/unit/util/time-unit-test-clock.t.cpp
index dd8346a..c47bdda 100644
--- a/tests/unit/util/time-unit-test-clock.t.cpp
+++ b/tests/unit/util/time-unit-test-clock.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/time-unit-test-clock.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/util/time-unit-test-clock.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <thread>
diff --git a/tests/unit/util/time.t.cpp b/tests/unit/util/time.t.cpp
index a60e2d9..6ed55d5 100644
--- a/tests/unit/util/time.t.cpp
+++ b/tests/unit/util/time.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <thread>