2 files changed, 8 insertions, 4 deletions
diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp
index 43d030b519b..ff00128037a 100644
--- a/messagebus_test/src/tests/speed/cpp-client.cpp
+++ b/messagebus_test/src/tests/speed/cpp-client.cpp
@@ -7,6 +7,8 @@
 #include <vespa/messagebus/testlib/simplemessage.h>
 #include <vespa/messagebus/testlib/simpleprotocol.h>
 #include <vespa/messagebus/testlib/simplereply.h>
+#include <vespa/vespalib/util/time.h>
+#include <thread>
 #include <vespa/fastos/timestamp.h>
 #include <vespa/fastos/app.h>
 
@@ -100,7 +102,7 @@ App::Main()
     Client client(mb.getMessageBus(), SourceSessionParams().setTimeout(30s));
 
     // let the system 'warm up'
-    FastOS_Thread::Sleep(5000);
+    std::this_thread::sleep_for(5s);
 
     // inject messages into the feedback loop
     for (uint32_t i = 0; i < 1024; ++i) {
@@ -108,7 +110,7 @@ App::Main()
     }
 
     // let the system 'warm up'
-    FastOS_Thread::Sleep(5000);
+    std::this_thread::sleep_for(5s);
 
     fastos::StopWatch stopWatch;
     uint32_t okBefore   = 0;
@@ -117,7 +119,7 @@ App::Main()
     uint32_t failAfter  = 0;
 
     client.sample(okBefore, failBefore);
-    FastOS_Thread::Sleep(10000); // Benchmark time
+    std::this_thread::sleep_for(10s); // Benchmark time
     fastos::TimeStamp elapsed = stopWatch.elapsed();
     client.sample(okAfter, failAfter);
     double time = elapsed.ms();
diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp
index 82b884c46f2..a1aa5a5029c 100644
--- a/messagebus_test/src/tests/speed/cpp-server.cpp
+++ b/messagebus_test/src/tests/speed/cpp-server.cpp
@@ -6,6 +6,8 @@
 #include <vespa/messagebus/testlib/simpleprotocol.h>
 #include <vespa/messagebus/rpcmessagebus.h>
 #include <vespa/messagebus/network/rpcnetworkparams.h>
+#include <vespa/vespalib/util/time.h>
+#include <thread>
 #include <vespa/fastos/app.h>
 
 using namespace mbus;
@@ -62,7 +64,7 @@ App::Main()
                      "file:routing.cfg");
     Server server(mb.getMessageBus());
     while (true) {
-        FastOS_Thread::Sleep(1000);
+        std::this_thread::sleep_for(1s);
     }
     return 0;
 }