diff --git a/tests/boost-test.hpp b/tests/boost-test.hpp
index cd4ccfe..017a0be 100644
--- a/tests/boost-test.hpp
+++ b/tests/boost-test.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -30,7 +30,6 @@
 #pragma GCC system_header
 #pragma clang system_header
 
-#include <boost/concept_check.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/output_test_stream.hpp>
 
diff --git a/tests/chunks/aimd-rtt-estimator.t.cpp b/tests/chunks/aimd-rtt-estimator.t.cpp
index 9241fee..d254985 100644
--- a/tests/chunks/aimd-rtt-estimator.t.cpp
+++ b/tests/chunks/aimd-rtt-estimator.t.cpp
@@ -28,8 +28,6 @@
 
 #include "tests/test-common.hpp"
 
-#include <limits>
-
 namespace ndn {
 namespace chunks {
 namespace aimd {
diff --git a/tests/chunks/consumer.t.cpp b/tests/chunks/consumer.t.cpp
index 3662f24..37e9abe 100644
--- a/tests/chunks/consumer.t.cpp
+++ b/tests/chunks/consumer.t.cpp
@@ -29,7 +29,6 @@
 
 #include "tests/test-common.hpp"
 
-#include <boost/test/output_test_stream.hpp>
 #include <ndn-cxx/security/validator-null.hpp>
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
diff --git a/tests/dump/ndndump.t.cpp b/tests/dump/ndndump.t.cpp
index e371fa5..bad4efa 100644
--- a/tests/dump/ndndump.t.cpp
+++ b/tests/dump/ndndump.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017,  University of Memphis.
+/*
+ * Copyright (c) 2014-2018,  University of Memphis.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -19,13 +19,11 @@
 
 #include "tools/dump/ndndump.hpp"
 
+#include "tests/identity-management-fixture.hpp"
+#include "tests/test-common.hpp"
+
 #include <ndn-cxx/lp/packet.hpp>
 #include <ndn-cxx/net/ethernet.hpp>
-#include <ndn-cxx/security/key-chain.hpp>
-
-#include "tests/test-common.hpp"
-#include "tests/identity-management-fixture.hpp"
-#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace dump {
diff --git a/tests/identity-management-fixture.hpp b/tests/identity-management-fixture.hpp
index fbe5251..a0fac2e 100644
--- a/tests/identity-management-fixture.hpp
+++ b/tests/identity-management-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017,  Regents of the University of California.
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -21,8 +21,6 @@
 #define NDN_TOOLS_TESTS_IDENTITY_MANAGEMENT_FIXTURE_HPP
 
 #include "tests/test-common.hpp"
-#include <ndn-cxx/security/key-chain.hpp>
-#include <vector>
 
 namespace ndn {
 namespace tests {
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index be0b63d..c0052e2 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -27,14 +27,10 @@
 #define NDN_TOOLS_TESTS_TEST_COMMON_HPP
 
 #include "boost-test.hpp"
+#include "core/common.hpp"
 
-#include <ndn-cxx/data.hpp>
-#include <ndn-cxx/interest.hpp>
-#include <ndn-cxx/lp/nack.hpp>
 #include <ndn-cxx/util/time-unit-test-clock.hpp>
 
-#include <boost/asio/io_service.hpp>
-
 namespace ndn {
 namespace tests {