diff --git a/tests/tests/access-manager.t.cpp b/tests/tests/access-manager.t.cpp
index f97514a..b290960 100644
--- a/tests/tests/access-manager.t.cpp
+++ b/tests/tests/access-manager.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2018, Regents of the University of California
+/*
+ * Copyright (c) 2014-2020, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -19,8 +19,9 @@
 
 #include "access-manager.hpp"
 
-#include "tests-common.hpp"
+#include "boost-test.hpp"
 #include "dummy-forwarder.hpp"
+#include "unit-test-common-fixtures.hpp"
 
 #include <iostream>
 #include <ndn-cxx/util/string-helper.hpp>
diff --git a/tests/tests/decryptor.t.cpp b/tests/tests/decryptor.t.cpp
index 88bda75..cf6b44e 100644
--- a/tests/tests/decryptor.t.cpp
+++ b/tests/tests/decryptor.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2018, Regents of the University of California
+/*
+ * Copyright (c) 2014-2020, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -23,9 +23,10 @@
 #include "encrypted-content.hpp"
 #include "access-manager.hpp"
 
-#include "tests-common.hpp"
+#include "boost-test.hpp"
 #include "dummy-forwarder.hpp"
 #include "static-data.hpp"
+#include "unit-test-common-fixtures.hpp"
 
 #include <iostream>
 #include <boost/mpl/vector.hpp>
diff --git a/tests/tests/encrypted-content.t.cpp b/tests/tests/encrypted-content.t.cpp
index b4c6ded..ba229bf 100644
--- a/tests/tests/encrypted-content.t.cpp
+++ b/tests/tests/encrypted-content.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2018, Regents of the University of California
+/*
+ * Copyright (c) 2014-2020, Regents of the University of California
  *
  * This file is part of NAC (Name-Based Access Control for NDN).
  * See AUTHORS.md for complete list of NAC authors and contributors.
@@ -19,9 +19,7 @@
 
 #include "encrypted-content.hpp"
 
-#include "tests-common.hpp"
-
-#include <iostream>
+#include "boost-test.hpp"
 
 namespace ndn {
 namespace nac {
diff --git a/tests/tests/encryptor.t.cpp b/tests/tests/encryptor.t.cpp
index 5b8aae8..7a38071 100644
--- a/tests/tests/encryptor.t.cpp
+++ b/tests/tests/encryptor.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2018, Regents of the University of California
+/*
+ * Copyright (c) 2014-2020, Regents of the University of California
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -19,9 +19,10 @@
 
 #include "encryptor.hpp"
 
-#include "tests-common.hpp"
+#include "boost-test.hpp"
 #include "dummy-forwarder.hpp"
 #include "static-data.hpp"
+#include "unit-test-common-fixtures.hpp"
 
 #include <iostream>
 #include <ndn-cxx/util/string-helper.hpp>