diff --git a/tests/core/logger.cpp b/tests/core/logger.cpp
index 1ccbc31..5a85d45 100644
--- a/tests/core/logger.cpp
+++ b/tests/core/logger.cpp
@@ -24,14 +24,11 @@
 
 #include "core/logger.hpp"
 
-#include <boost/test/unit_test.hpp>
+#include "tests/test-common.hpp"
+
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-#include <iostream>
-
-#include "tests/test-common.hpp"
-
 namespace nfd {
 namespace tests {
 
diff --git a/tests/core/resolver.cpp b/tests/core/resolver.cpp
index a8e05ce..18d35b7 100644
--- a/tests/core/resolver.cpp
+++ b/tests/core/resolver.cpp
@@ -24,7 +24,6 @@
 
 #include "core/resolver.hpp"
 #include "core/logger.hpp"
-#include <boost/test/unit_test.hpp>
 
 #include "tests/test-common.hpp"
 
diff --git a/tests/face/ndnlp.cpp b/tests/face/ndnlp.cpp
index 66a1c84..f5ba8e1 100644
--- a/tests/face/ndnlp.cpp
+++ b/tests/face/ndnlp.cpp
@@ -156,8 +156,10 @@
   ReassembleFixture()
     : m_slicer(1500)
   {
-    m_partialMessageStore.onReceive += bind(&std::vector<Block>::push_back,
-                                            &m_received, _1);
+    m_partialMessageStore.onReceive +=
+      // push_back in C++11 has 2 overloads, and specific version needs to be selected
+      bind(static_cast<void (std::vector<Block>::*)(const Block&)>(&std::vector<Block>::push_back),
+           &m_received, _1);
   }
 
   Block
diff --git a/tests/mgmt/command-validator.cpp b/tests/mgmt/command-validator.cpp
index 7f34971..69c44a0 100644
--- a/tests/mgmt/command-validator.cpp
+++ b/tests/mgmt/command-validator.cpp
@@ -27,10 +27,10 @@
 
 #include "tests/test-common.hpp"
 
-#include <boost/test/unit_test.hpp>
 #include <ndn-cpp-dev/util/command-interest-generator.hpp>
 #include <ndn-cpp-dev/util/io.hpp>
 #include <boost/filesystem.hpp>
+#include <fstream>
 
 namespace nfd {
 
diff --git a/tests/mgmt/config-file.cpp b/tests/mgmt/config-file.cpp
index df0d9c3..ff352d4 100644
--- a/tests/mgmt/config-file.cpp
+++ b/tests/mgmt/config-file.cpp
@@ -22,11 +22,12 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-
 #include "mgmt/config-file.hpp"
 
 #include "tests/test-common.hpp"
 
+#include <fstream>
+
 namespace nfd {
 namespace tests {
 
diff --git a/tests/mgmt/fib-enumeration-publisher-common.hpp b/tests/mgmt/fib-enumeration-publisher-common.hpp
index cfe4232..b5ce20c 100644
--- a/tests/mgmt/fib-enumeration-publisher-common.hpp
+++ b/tests/mgmt/fib-enumeration-publisher-common.hpp
@@ -29,6 +29,8 @@
 
 #include "mgmt/app-face.hpp"
 #include "mgmt/internal-face.hpp"
+#include "table/fib.hpp"
+#include "table/name-tree.hpp"
 
 #include "tests/test-common.hpp"
 #include "../face/dummy-face.hpp"
@@ -79,13 +81,11 @@
     , m_publisher(m_fib, m_face, "/localhost/nfd/FibEnumerationPublisherFixture")
     , m_finished(false)
   {
-
   }
 
   virtual
   ~FibEnumerationPublisherFixture()
   {
-
   }
 
   bool