diff --git a/tests/integrated/default-can-be-prefix-0.cpp b/tests/integrated/default-can-be-prefix-0.cpp
index 8be2c4f..77a3042 100644
--- a/tests/integrated/default-can-be-prefix-0.cpp
+++ b/tests/integrated/default-can-be-prefix-0.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=0)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/default-can-be-prefix-1.cpp b/tests/integrated/default-can-be-prefix-1.cpp
index e2071e1..f2f6a52 100644
--- a/tests/integrated/default-can-be-prefix-1.cpp
+++ b/tests/integrated/default-can-be-prefix-1.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=1)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/default-can-be-prefix-unset.cpp b/tests/integrated/default-can-be-prefix-unset.cpp
index 88375da..0498eae 100644
--- a/tests/integrated/default-can-be-prefix-unset.cpp
+++ b/tests/integrated/default-can-be-prefix-unset.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=unset)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/encoding-benchmark.cpp b/tests/integrated/encoding-benchmark.cpp
index d18fa29..8f503a0 100644
--- a/tests/integrated/encoding-benchmark.cpp
+++ b/tests/integrated/encoding-benchmark.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,14 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Encoding Benchmark
+#include "tests/boost-test.hpp"
 
-#include "encoding/tlv.hpp"
-
-#include "boost-test.hpp"
-#include "timed-execute.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "tests/integrated/timed-execute.hpp"
 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/tests/integrated/face.cpp b/tests/integrated/face.cpp
index adbe314..99d5a20 100644
--- a/tests/integrated/face.cpp
+++ b/tests/integrated/face.cpp
@@ -19,23 +19,22 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (Face)
+#include "tests/boost-test.hpp"
 
-#include "face.hpp"
-#include "transport/tcp-transport.hpp"
-#include "transport/unix-transport.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/make-interest-data.hpp"
 
 #include <stdio.h>
-#include <thread>
-#include <mutex>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
+
 #include <boost/mpl/vector.hpp>
 
 namespace ndn {
diff --git a/tests/integrated/network-monitor.cpp b/tests/integrated/network-monitor.cpp
index 45cb57b..4c4467b 100644
--- a/tests/integrated/network-monitor.cpp
+++ b/tests/integrated/network-monitor.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,19 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (Network Monitor)
+#include "tests/boost-test.hpp"
 
-#include "net/network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
-#include "net/network-address.hpp"
-#include "net/network-interface.hpp"
-#include "net/detail/link-type-helper.hpp"
-#include "util/string-helper.hpp"
-#include "util/time.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/net/network-address.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
+#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <iostream>
diff --git a/tests/integrated/scheduler-benchmark.cpp b/tests/integrated/scheduler-benchmark.cpp
index b861f04..9bc4600 100644
--- a/tests/integrated/scheduler-benchmark.cpp
+++ b/tests/integrated/scheduler-benchmark.cpp
@@ -19,14 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Scheduler Benchmark
+#include "tests/boost-test.hpp"
 
-#include "util/scheduler.hpp"
-
-#include "boost-test.hpp"
-#include "timed-execute.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "tests/integrated/timed-execute.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <iostream>
diff --git a/tests/integrated/timed-execute.hpp b/tests/integrated/timed-execute.hpp
index 7f71e72..83767a1 100644
--- a/tests/integrated/timed-execute.hpp
+++ b/tests/integrated/timed-execute.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,7 +22,7 @@
 #ifndef NDN_TESTS_INTEGRATED_TIMED_EXECUTE_HPP
 #define NDN_TESTS_INTEGRATED_TIMED_EXECUTE_HPP
 
-#include "util/time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/wscript b/tests/integrated/wscript
index 21327a9..73158d8 100644
--- a/tests/integrated/wscript
+++ b/tests/integrated/wscript
@@ -8,5 +8,5 @@
         bld.program(name='test-%s' % name,
                     target=name,
                     source=[test],
-                    use='tests-base',
+                    use='tests-common',
                     install_path=None)