diff --git a/source/tests/metacall_node_signal_handler_test/source/metacall_node_signal_handler_test.cpp b/source/tests/metacall_node_signal_handler_test/source/metacall_node_signal_handler_test.cpp
index cebe8f6a0..4b9141b1f 100644
--- a/source/tests/metacall_node_signal_handler_test/source/metacall_node_signal_handler_test.cpp
+++ b/source/tests/metacall_node_signal_handler_test/source/metacall_node_signal_handler_test.cpp
@@ -24,8 +24,6 @@
 #include <metacall/metacall_loaders.h>
 
 #include <atomic>
-#include <chrono>
-#include <thread>
 
 std::atomic_bool callback_result(false);
 std::atomic_bool signal_result(false);
@@ -86,17 +84,24 @@ TEST_F(metacall_node_signal_handler_test, DefaultConstructor)
 
 	const char buffer[] =
 		"const { metacall } = require('" METACALL_NODE_PORT_PATH "');\n"
+		"let notified = false;\n"
+		"const notify = () => {\n"
+		"	if (notified === true) return;\n"
+		"	notified = true;\n"
+		"	metacall('c_callback');\n"
+		"};\n"
 		"const cp = require('child_process');\n"
 		"let sp = cp.spawn('ps');\n"
 		"sp.stdout.on('data', data => {\n"
 		"	console.log('node: stdout: ' + data.toString());\n"
 		"});\n"
-		"sp.on('exit', (code, signal) => {\n"
-		"	console.log(`node: child process exited with code ${code}`);\n"
-		"});\n"
 		"process.on('SIGCHLD', () => {\n"
 		"	console.log(`node: Received SIGCHLD signal in process`);\n"
-		"	metacall('c_callback');\n"
+		"	notify()\n"
+		"});\n"
+		"sp.on('exit', code => {\n"
+		"	console.log(`node: child process exited with code ${code}`);\n"
+		"	notify();\n" /* Sometimes exit event gets received before SIGCHLD, so we notify anyway to c_callback */
 		"});\n";
 
 	EXPECT_EQ((int)0, (int)metacall_load_from_memory("node", buffer, sizeof(buffer), NULL));
@@ -122,11 +127,6 @@ TEST_F(metacall_node_signal_handler_test, DefaultConstructor)
 		metacall_allocator_destroy(allocator);
 	}
 
-	/* Apparently it seems to fail randomly due to a race condition between processes
-	and I do not want to implement a wait mechanism because this is just a PoC.
-	TODO: I am not sure but could this be related to the destroy mechanism of NodeJS? We should review it */
-	std::this_thread::sleep_for(std::chrono::seconds(10));
-
 	EXPECT_EQ((int)0, (int)metacall_destroy());
 
 	EXPECT_EQ((bool)callback_result.load(), (bool)true);