diff --git a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
index a7d84e058b..7c650ae118 100644
--- a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc
@@ -181,10 +181,6 @@ TEST_F(HAMtServiceTest, multiThreadingBasics) {
     // Enable DHCP multi-threading configuration in CfgMgr with 3 threads.
     setDHCPMultiThreadingConfig(true, 3);
 
-    /// @todo this is a hack... we have chicken-egg...  CmdHttpListener won't
-    /// start if MT is not enabled BUT that happens after config hook point
-    MultiThreadingMgr::instance().setMode(true);
-
     // Create the HA configuration
     HAConfigPtr ha_config(new HAConfig());
     HAConfigParser parser;
diff --git a/src/lib/http/tests/mt_client_unittests.cc b/src/lib/http/tests/mt_client_unittests.cc
index 2dfc69a251..49853f25af 100644
--- a/src/lib/http/tests/mt_client_unittests.cc
+++ b/src/lib/http/tests/mt_client_unittests.cc
@@ -494,13 +494,7 @@ public:
         }
 
         // Loop until the clients are done, an error occurs, or the time runs out.
-        while (getRRCount() < expected_requests_) {
-            // Always call restart() before we call run();
-            io_service_.restart();
-
-            // Run until a client stops the service.
-            io_service_.run();
-        }
+        runIOService(expected_requests_);
 
         // Client should stop without issue.
         ASSERT_NO_THROW(client_->stop());