diff --git a/fairmq/ofi/Context.cxx b/fairmq/ofi/Context.cxx
index 0c9544d6..635730aa 100644
--- a/fairmq/ofi/Context.cxx
+++ b/fairmq/ofi/Context.cxx
@@ -62,6 +62,9 @@ auto Context::InitThreadPool(int numberIoThreads) -> void
 
 auto Context::Reset() -> void
 {
+    // TODO "Linger", rethink this
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+
     fIoContext.stop();
 }
 
diff --git a/test/helper/devices/TestPairLeft.h b/test/helper/devices/TestPairLeft.h
index bb08ae10..66172de0 100644
--- a/test/helper/devices/TestPairLeft.h
+++ b/test/helper/devices/TestPairLeft.h
@@ -57,6 +57,7 @@ class PairLeft : public FairMQDevice
         if (counter == 6) LOG(info) << "Simple message with short text data successfull";
 
         assert(counter == 6);
+        if (counter == 6) LOG(info) << "PAIR test successfull.";
     };
 };
 
diff --git a/test/helper/devices/TestPairRight.h b/test/helper/devices/TestPairRight.h
index f1dc9025..e23bf4c8 100644
--- a/test/helper/devices/TestPairRight.h
+++ b/test/helper/devices/TestPairRight.h
@@ -55,9 +55,6 @@ class PairRight : public FairMQDevice
         auto msg6(NewSimpleMessageFor("data", 0, "testdata1234"));
         if (Send(msg6, "data") >= 0) counter++;
         if (counter == 6) LOG(info) << "Simple message with short text data successfull";
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-        if (counter == 6) LOG(info) << "PAIR test successfull.";
     };
 };
 
@@ -65,4 +62,4 @@ class PairRight : public FairMQDevice
 } // namespace mq
 } // namespace fair
 
-#endif /* FAIR_MQ_TEST_PAIRRIGHT_H */
\ No newline at end of file
+#endif /* FAIR_MQ_TEST_PAIRRIGHT_H */