diff --git a/tests/io/ConcurrentNetworkEchoTest.cpp b/tests/io/ConcurrentNetworkEchoTest.cpp
index 30d2c864ac931b9dcef269e3196990ba4594776f..2b907ed8fb0735503116129193e430090e3facec 100644
--- a/tests/io/ConcurrentNetworkEchoTest.cpp
+++ b/tests/io/ConcurrentNetworkEchoTest.cpp
@@ -3,13 +3,16 @@
 #include <cstdlib>
 #include <iostream>
 #include <string>
+#include <thread>
 #include <vector>
 
 #include "Common.hpp"
 #include "CountingPrivateSemaphore.hpp"
+#include "Debug.hpp"
 #include "Emper.hpp"
 #include "Fiber.hpp"
 #include "Runtime.hpp"
+#include "emper-config.h"
 #include "emper.hpp"
 #include "fixtures/network.hpp"
 #include "io.hpp"
@@ -21,8 +24,8 @@ auto main(int argc, char* argv[]) -> int {
 		exit(77);
 	}
 
-	unsigned int client_count = 10;
-	unsigned int echos = 500;
+	unsigned int client_count = std::thread::hardware_concurrency() * 4;
+	unsigned int echos = EMPER_LOG_LEVEL > Info ? 250 : 25000;
 	std::string port = "4241";
 	std::string host = "127.0.0.1";
 
@@ -40,6 +43,9 @@ auto main(int argc, char* argv[]) -> int {
 		echos = strtol(argv[2], nullptr, DECIMAL);
 	}
 
+	std::cout << "ConcurrentNetworkEchoTest with " << client_count << " clients sending " << echos
+						<< " echos" << std::endl;
+
 	Runtime runtime;
 
 	Fiber* listener =
diff --git a/tests/io/meson.build b/tests/io/meson.build
index 234a6016f0b42cec03c14fff48e9ebbd6cf8fdde..9f34a0d6fcff918e170dc05c6ba53b9b134a109a 100644
--- a/tests/io/meson.build
+++ b/tests/io/meson.build
@@ -93,6 +93,5 @@ tests += [
 		'name': 'ConcurrentNetworkEchoTest',
 		'description': 'Concurrent network echo test with 10 clients',
 		'test_suite': 'io',
-		'args': ['10', '10000'],
 	},
 ]