diff --git a/src/node_main.cc b/src/node_main.cc
index 02082ba016..bde3975624 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -50,7 +50,10 @@ int wmain(int argc, wchar_t *wargv[]) {
 #else
 // UNIX
 int main(int argc, char *argv[]) {
-  setvbuf(stderr, NULL, _IOLBF, 1024);
+  // Disable stdio buffering, it interacts poorly with printf()
+  // calls elsewhere in the program (e.g., any logging from V8.)
+  setvbuf(stdout, nullptr, _IONBF, 0);
+  setvbuf(stderr, nullptr, _IONBF, 0);
   return node::Start(argc, argv);
 }
 #endif
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index e3a8e345f7..fc71d41657 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -22,6 +22,7 @@ test-tls-connect-address-family : PASS,FLAKY
 [$system==macos]
 
 [$system==solaris] # Also applies to SmartOS
+test-debug-signal-cluster         : PASS,FLAKY
 
 [$system==freebsd]