1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/d2srv/tests/nc_trans_unittests.cc b/src/lib/d2srv/tests/nc_trans_unittests.cc
index 39e024f39a..adc87328eb 100644
--- a/src/lib/d2srv/tests/nc_trans_unittests.cc
+++ b/src/lib/d2srv/tests/nc_trans_unittests.cc
@@ -279,12 +279,7 @@ public:
 
     virtual ~NameChangeTransactionTest() {
         timer_->cancel();
-        io_service_->stop();
-        io_service_->restart();
-        try {
-            io_service_->poll();
-        } catch (...) {
-        }
+        io_service_->stopAndPoll();
         io_service_.reset(new IOService());
         timer_.reset(new IntervalTimer(io_service_));
     }