diff --git a/tests/test-adjacency-list.cpp b/tests/test-adjacency-list.cpp
index 9a46a1c..465fd9a 100644
--- a/tests/test-adjacency-list.cpp
+++ b/tests/test-adjacency-list.cpp
@@ -19,8 +19,9 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include "adjacency-list.hpp"
+#include "common.hpp"
 
+#include "adjacency-list.hpp"
 #include "adjacent.hpp"
 #include "conf-parameter.hpp"
 
diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 2dd6f3e..49501bf 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -123,8 +123,8 @@
   BOOST_CHECK_EQUAL(it->getName(), oldInterestName);
   interests.clear();
 
-  steady_clock::TimePoint deadline = steady_clock::now() +
-                                     ndn::time::seconds(LSA_REFRESH_TIME_MAX);
+  ndn::time::steady_clock::TimePoint deadline = ndn::time::steady_clock::now() +
+    ndn::time::seconds(LSA_REFRESH_TIME_MAX);
 
   // Simulate an LSA interest timeout
   lsdb.onFetchLsaError(ndn::util::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",
diff --git a/tests/update/test-prefix-update-processor.cpp b/tests/update/test-prefix-update-processor.cpp
index 32cacb5..42d9fa0 100644
--- a/tests/update/test-prefix-update-processor.cpp
+++ b/tests/update/test-prefix-update-processor.cpp
@@ -169,7 +169,7 @@
     lsaInterestName.append(sessionTime);
     lsaInterestName.appendNumber(nlsr.getLsdb().getSequencingManager().getNameLsaSeq());
 
-    shared_ptr<Interest> lsaInterest = make_shared<Interest>(lsaInterestName);
+    std::shared_ptr<Interest> lsaInterest = std::make_shared<Interest>(lsaInterestName);
 
     face.receive(*lsaInterest);
     this->advanceClocks(ndn::time::milliseconds(10));