diff --git a/tests/identity-management-fixture.cpp b/tests/identity-management-fixture.cpp
index c5aed73..77cc97c 100644
--- a/tests/identity-management-fixture.cpp
+++ b/tests/identity-management-fixture.cpp
@@ -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-2020,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,14 +26,14 @@
 #include "identity-management-fixture.hpp"
 
 #include <ndn-cxx/util/io.hpp>
-#include <ndn-cxx/security/v2/additional-description.hpp>
+#include <ndn-cxx/security/additional-description.hpp>
 
 #include <boost/filesystem.hpp>
 
 namespace nlsr {
 namespace tests {
 
-namespace v2 = ndn::security::v2;
+namespace v2 = ndn::security;
 namespace io = ndn::io;
 namespace time = ndn::time;
 
diff --git a/tests/identity-management-fixture.hpp b/tests/identity-management-fixture.hpp
index acd75d0..447a320 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-2020,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include <ndn-cxx/security/v2/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
 
 namespace nlsr {
@@ -93,7 +93,7 @@
   /**
    * @brief Add a self-signed certificate to @p key with issuer ID @p issuer
    */
-  ndn::security::v2::Certificate
+  ndn::security::Certificate
   addCertificate(const ndn::security::Key& key, const std::string& issuer);
 
 protected:
diff --git a/tests/security/test-certificate-store.cpp b/tests/security/test-certificate-store.cpp
index 0009c17..b4ef2da 100644
--- a/tests/security/test-certificate-store.cpp
+++ b/tests/security/test-certificate-store.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2020,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "security/certificate-store.hpp"
 
@@ -116,7 +116,7 @@
 
   Nlsr nlsr;
   Lsdb& lsdb;
-  ndn::security::v2::Certificate certificate;
+  ndn::security::Certificate certificate;
   ndn::Name certificateKey;
   security::CertificateStore certStore;
   const boost::filesystem::path ROOT_CERT_PATH;
@@ -201,7 +201,7 @@
   // Make NLSR validate data signed by its own key
   conf.getValidator().validate(data,
                                  [] (const ndn::Data&) { BOOST_CHECK(true); },
-                                 [] (const ndn::Data&, const ndn::security::v2::ValidationError&) {
+                                 [] (const ndn::Data&, const ndn::security::ValidationError&) {
                                    BOOST_CHECK(false);
                                  });
 
diff --git a/tests/test-home-fixture.hpp b/tests/test-home-fixture.hpp
index a3ced4e..e712f25 100644
--- a/tests/test-home-fixture.hpp
+++ b/tests/test-home-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-2020,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -30,8 +30,6 @@
 
 #include <fstream>
 
-#include <ndn-cxx/security/v2/key-chain.hpp>
-
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -80,8 +78,6 @@
     }
 
     boost::filesystem::remove_all(m_pibDir);
-    //const_cast<std::string&>(ndn::security::v2::KeyChain::getDefaultPibLocator()).clear();
-    //const_cast<std::string&>(ndn::security::v2::KeyChain::getDefaultTpmLocator()).clear();
   }
 
 protected:
diff --git a/tests/test-lsa-rule.cpp b/tests/test-lsa-rule.cpp
index 00c0ded..2827cd1 100644
--- a/tests/test-lsa-rule.cpp
+++ b/tests/test-lsa-rule.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2020,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "test-common.hpp"
 #include "nlsr.hpp"
@@ -136,7 +136,7 @@
   // Make NLSR validate data signed by its own key
   confParam.getValidator().validate(data,
                                     [] (const Data&) { BOOST_CHECK(true); },
-                                    [] (const Data&, const ndn::security::v2::ValidationError&) {
+                                    [] (const Data&, const ndn::security::ValidationError&) {
                                       BOOST_CHECK(false);
                                     });
 }
@@ -163,7 +163,7 @@
   // Make NLSR validate data signed by its own key
   confParam.getValidator().validate(data,
                                     [] (const Data&) { BOOST_CHECK(false); },
-                                    [] (const Data&, const ndn::security::v2::ValidationError&) {
+                                    [] (const Data&, const ndn::security::ValidationError&) {
                                       BOOST_CHECK(true);
                                     });
 }
diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 9ed1f26..cf0de05 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2020,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "lsdb.hpp"
 
@@ -238,7 +238,7 @@
   face.linkTo(face2);
 
   auto fetcher = ndn::util::SegmentFetcher::start(face2, ndn::Interest(interestName),
-                                                  ndn::security::v2::getAcceptAllValidator());
+                                                  ndn::security::getAcceptAllValidator());
   fetcher->onComplete.connect([&expectedDataContent] (ndn::ConstBufferPtr bufferPtr) {
                                 ndn::Block block(bufferPtr);
                                 BOOST_CHECK_EQUAL(expectedDataContent, block);