diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index 23e8617..1f3beb3 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -19,9 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDNCERT_TESTS_COMMON_HPP
-#define NDNCERT_TESTS_COMMON_HPP
+#ifndef NDNCERT_TESTS_TEST_COMMON_HPP
+#define NDNCERT_TESTS_TEST_COMMON_HPP
 
+#include "boost-test.hpp"
+#include "database-fixture.hpp"
+#include "identity-management-fixture.hpp"
+#include "unit-test-time-fixture.hpp"
 #include <iostream>
 #include <ndn-cxx/metadata-object.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
@@ -32,9 +36,4 @@
 #include <ndn-cxx/security/verification-helpers.hpp>
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
-#include "boost-test.hpp"
-#include "database-fixture.hpp"
-#include "identity-management-fixture.hpp"
-#include "unit-test-time-fixture.hpp"
-
-#endif // NDNCERT_TESTS_COMMON_HPP
+#endif // NDNCERT_TESTS_TEST_COMMON_HPP
diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index aeb7b7e..11fb328 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -20,8 +20,6 @@
 
 #include "identity-challenge/challenge-credential.hpp"
 #include "test-common.hpp"
-#include <ndn-cxx/security/signing-helpers.hpp>
-#include <ndn-cxx/util/io.hpp>
 
 namespace ndn {
 namespace ndncert {
@@ -31,7 +29,7 @@
 
 BOOST_AUTO_TEST_CASE(LoadConfig)
 {
-  ChallengeCredential challenge("./tests/unit-tests/challenge-credential.conf.test");
+  ChallengeCredential challenge("./tests/unit-tests/config-files/config-challenge-credential");
   BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "Credential");
 
   challenge.parseConfigFile();
@@ -44,7 +42,7 @@
 BOOST_AUTO_TEST_CASE(HandleChallengeRequest)
 {
   // create trust anchor
-  ChallengeCredential challenge("./tests/unit-tests/challenge-credential.conf.test");
+  ChallengeCredential challenge("./tests/unit-tests/config-files/config-challenge-credential");
   auto identity = addIdentity(Name("/trust"));
   auto key = identity.getDefaultKey();
   auto trustAnchor = key.getDefaultCertificate();
diff --git a/tests/unit-tests/challenge-credential.conf.test b/tests/unit-tests/config-files/config-challenge-credential
similarity index 100%
rename from tests/unit-tests/challenge-credential.conf.test
rename to tests/unit-tests/config-files/config-challenge-credential
diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index 95b892f..50fc543 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -18,10 +18,9 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include <protocol-detail/error.hpp>
-#include <protocol-detail/probe.hpp>
-#include <ndn-cxx/util/io.hpp>
 #include "requester.hpp"
+#include "protocol-detail/error.hpp"
+#include "protocol-detail/probe.hpp"
 #include "identity-challenge/challenge-module.hpp"
 #include "ca-module.hpp"
 #include "test-common.hpp"