diff --git a/tests/integrated/network-monitor.cpp b/tests/integrated/network-monitor.cpp
index 4c4467b..57cea97 100644
--- a/tests/integrated/network-monitor.cpp
+++ b/tests/integrated/network-monitor.cpp
@@ -26,7 +26,7 @@
 
 #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/net/impl/link-type-helper.hpp"
 #include "ndn-cxx/util/string-helper.hpp"
 #include "ndn-cxx/util/time.hpp"
 
diff --git a/tests/unit/security/pib/identity.t.cpp b/tests/unit/security/pib/identity.t.cpp
index 5e2f28a..5769fde 100644
--- a/tests/unit/security/pib/identity.t.cpp
+++ b/tests/unit/security/pib/identity.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/pib/identity.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 
 #include "tests/boost-test.hpp"
 #include "tests/unit/security/pib/pib-data-fixture.hpp"
diff --git a/tests/unit/security/pib/detail/identity-impl.t.cpp b/tests/unit/security/pib/impl/identity-impl.t.cpp
similarity index 98%
rename from tests/unit/security/pib/detail/identity-impl.t.cpp
rename to tests/unit/security/pib/impl/identity-impl.t.cpp
index e3243e3..40bf424 100644
--- a/tests/unit/security/pib/detail/identity-impl.t.cpp
+++ b/tests/unit/security/pib/impl/identity-impl.t.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/impl/identity-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
 
diff --git a/tests/unit/security/pib/detail/key-impl.t.cpp b/tests/unit/security/pib/impl/key-impl.t.cpp
similarity index 99%
rename from tests/unit/security/pib/detail/key-impl.t.cpp
rename to tests/unit/security/pib/impl/key-impl.t.cpp
index ea9499c..e6860be 100644
--- a/tests/unit/security/pib/detail/key-impl.t.cpp
+++ b/tests/unit/security/pib/impl/key-impl.t.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
 
diff --git a/tests/unit/security/pib/key.t.cpp b/tests/unit/security/pib/key.t.cpp
index 86f7dfa..8dfe9c8 100644
--- a/tests/unit/security/pib/key.t.cpp
+++ b/tests/unit/security/pib/key.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/pib/key.hpp"
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/pib/pib-memory.hpp"
-#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/impl/key-impl.hpp"
 
 #include "tests/boost-test.hpp"
 #include "tests/unit/security/pib/pib-data-fixture.hpp"
diff --git a/tests/unit/security/transform/digest-filter.t.cpp b/tests/unit/security/transform/digest-filter.t.cpp
index 67ccc4c..984611d 100644
--- a/tests/unit/security/transform/digest-filter.t.cpp
+++ b/tests/unit/security/transform/digest-filter.t.cpp
@@ -22,7 +22,7 @@
 #include "ndn-cxx/security/transform/digest-filter.hpp"
 
 #include "ndn-cxx/encoding/buffer-stream.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 #include "ndn-cxx/security/transform/buffer-source.hpp"
 #include "ndn-cxx/security/transform/step-source.hpp"
 #include "ndn-cxx/security/transform/stream-sink.hpp"
diff --git a/tests/unit/util/random.t.cpp b/tests/unit/util/random.t.cpp
index ee55f9e..9cf7325 100644
--- a/tests/unit/util/random.t.cpp
+++ b/tests/unit/util/random.t.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ndn-cxx/util/random.hpp"
-#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/impl/openssl.hpp"
 
 #include "tests/boost-test.hpp"