diff --git a/testing/ext/discovery.cpp b/testing/ext/discovery.cpp
index 4523a1fed..9ff923a4c 100644
--- a/testing/ext/discovery.cpp
+++ b/testing/ext/discovery.cpp
@@ -7,16 +7,20 @@
 namespace {
 
 TEST_CASE("resolve multiple streams", "[resolver][basic]") {
-	lsl::continuous_resolver resolver("type", "Resolve", 50.);
+	// First create the outlets (to avoid extra waiting for
+	// multiple resolves)
 	std::vector<lsl::stream_outlet> outlets;
 	const int n = 3;
 	for (int i = 0; i < n; i++)
 		outlets.emplace_back(lsl::stream_info("resolvetest_" + std::to_string(i), "Resolve"));
+	lsl::continuous_resolver resolver("type", "Resolve", 50.);
+
+	// Verify with one-time resolve
 	auto found_stream_info = lsl::resolve_stream("type", "Resolve", n, 2.0);
 	REQUIRE(found_stream_info.size() == n);
 
-	// Allow the resolver a bit more time in case the first resolve wave was too fast
-	std::this_thread::sleep_for(std::chrono::seconds(1));
+	// Allow for enough time (interval, min_rtt)
+	std::this_thread::sleep_for(std::chrono::milliseconds(1600));
 	REQUIRE(resolver.results().size() == n);
 }