diff --git a/tests/io-fixture.hpp b/tests/io-fixture.hpp
index 782f7df..e7c65ec 100644
--- a/tests/io-fixture.hpp
+++ b/tests/io-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,7 +28,7 @@
 
 #include "tests/clock-fixture.hpp"
 
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 
 namespace nlsr::test {
 
@@ -39,17 +39,13 @@
   afterTick() final
   {
     if (m_io.stopped()) {
-#if BOOST_VERSION >= 106600
       m_io.restart();
-#else
-      m_io.reset();
-#endif
     }
     m_io.poll();
   }
 
 protected:
-  boost::asio::io_service m_io;
+  boost::asio::io_context m_io;
 };
 
 } // namespace nlsr::test
diff --git a/tests/update/test-nfd-rib-command-processor.cpp b/tests/update/test-nfd-rib-command-processor.cpp
index 5105f9c..b055275 100644
--- a/tests/update/test-nfd-rib-command-processor.cpp
+++ b/tests/update/test-nfd-rib-command-processor.cpp
@@ -28,6 +28,7 @@
 #include "tests/test-common.hpp"
 
 #include <boost/lexical_cast.hpp>
+#include <boost/mp11/list.hpp>
 
 namespace nlsr {
 namespace test {
@@ -97,8 +98,10 @@
   uint64_t nameLsaSeqNoBeforeInterest;
 };
 
-typedef boost::mpl::vector<update::NfdRibRegisterCommand,
-                           update::NfdRibUnregisterCommand> Commands;
+using Commands = boost::mp11::mp_list<
+  update::NfdRibRegisterCommand,
+  update::NfdRibUnregisterCommand
+>;
 
 BOOST_FIXTURE_TEST_SUITE(TestNfdRibCommandProcessor, NfdRibCommandProcessorFixture)
 
diff --git a/tests/wscript b/tests/wscript
index fe86136..2e680c8 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,6 +1,6 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 """
-Copyright (c) 2014-2022,  The University of Memphis
+Copyright (c) 2014-2023,  The University of Memphis
                           Regents of the University of California
 
 This file is part of NLSR (Named-data Link State Routing).
@@ -21,12 +21,10 @@
 top = '..'
 
 def build(bld):
-    bld.objects(target='unit-test-objects',
-                source=bld.path.ant_glob('**/*.cpp', excl=['main.cpp']),
-                use='nlsr-objects')
-
-    bld.program(target='../unit-tests-nlsr',
-                name='unit-tests-nlsr',
-                source='main.cpp',
-                use='unit-test-objects',
-                install_path=None)
+    bld.program(
+        target=f'{top}/unit-tests-nlsr',
+        name='unit-tests-nlsr',
+        source=bld.path.ant_glob('**/*.cpp'),
+        use='BOOST_TESTS nlsr-objects',
+        includes=top,
+        install_path=None)