diff --git a/src/node_main.cc b/src/node_main.cc
index 13a70b2d0d33d7..58e747e52c49ef 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -41,6 +41,7 @@ int wmain(int argc, wchar_t *wargv[]) {
 #else
 // UNIX
 int main(int argc, char *argv[]) {
+  setvbuf(stderr, NULL, _IOLBF, 1024);
   return node::Start(argc, argv);
 }
 #endif
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 69a154730658d2..9334614d5626d8 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -18,7 +18,6 @@ test-child-process-exit-code      : PASS,FLAKY
 [$system==macos]
 
 [$system==solaris] # Also applies to SmartOS
-test-debug-signal-cluster         : PASS,FLAKY
 
 [$system==freebsd]
 test-net-socket-local-address     : PASS,FLAKY