diff --git a/test/disabled/test-cat.js b/test/disabled/test-cat.js
index 7339fca368e..9210ec570d7 100644
--- a/test/disabled/test-cat.js
+++ b/test/disabled/test-cat.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common.js');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/disabled/test-child-process-uid-gid.js b/test/disabled/test-child-process-uid-gid.js
index 021c16d030e..53e6c9d3da3 100644
--- a/test/disabled/test-child-process-uid-gid.js
+++ b/test/disabled/test-child-process-uid-gid.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var assert = require("assert");
 var spawn = require("child_process").spawn;
 var fs = require('fs');
diff --git a/test/disabled/test-dns.js b/test/disabled/test-dns.js
index 6c17868fe6a..8ea8a115348 100644
--- a/test/disabled/test-dns.js
+++ b/test/disabled/test-dns.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-eio-race3.js b/test/disabled/test-eio-race3.js
index fa5ea970263..712a1375819 100644
--- a/test/disabled/test-eio-race3.js
+++ b/test/disabled/test-eio-race3.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 /* XXX Can this test be modified to not call the now-removed wait()? */
 
 var common = require('../common');
diff --git a/test/disabled/test-fs-largefile.js b/test/disabled/test-fs-largefile.js
index 83e58792490..88a32fc87ce 100644
--- a/test/disabled/test-fs-largefile.js
+++ b/test/disabled/test-fs-largefile.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path'),
diff --git a/test/disabled/test-fs-sendfile.js b/test/disabled/test-fs-sendfile.js
index 809e68fc30a..4dc8e37ee50 100644
--- a/test/disabled/test-fs-sendfile.js
+++ b/test/disabled/test-fs-sendfile.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-http-agent2.js b/test/disabled/test-http-agent2.js
index 0a1612d382e..9ea266789e1 100644
--- a/test/disabled/test-http-agent2.js
+++ b/test/disabled/test-http-agent2.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/disabled/test-http-big-proxy-responses.js b/test/disabled/test-http-big-proxy-responses.js
index 9140f7b6b6d..e43ea7a40e1 100644
--- a/test/disabled/test-http-big-proxy-responses.js
+++ b/test/disabled/test-http-big-proxy-responses.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var util = require('util'),
diff --git a/test/disabled/test-http-default-port.js b/test/disabled/test-http-default-port.js
index 180c6c78b6f..b1bccf0fa7f 100644
--- a/test/disabled/test-http-default-port.js
+++ b/test/disabled/test-http-default-port.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This must be run as root.
 
 var http = require("http"),
diff --git a/test/disabled/test-http-head-request.js b/test/disabled/test-http-head-request.js
index 73f0322b754..8b0f40074f0 100644
--- a/test/disabled/test-http-head-request.js
+++ b/test/disabled/test-http-head-request.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-http-stress.js b/test/disabled/test-http-stress.js
index 34ed955251f..7a1cee1e4f1 100644
--- a/test/disabled/test-http-stress.js
+++ b/test/disabled/test-http-stress.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-http-tls.js b/test/disabled/test-http-tls.js
index bbf08f314f7..9540391bf39 100644
--- a/test/disabled/test-http-tls.js
+++ b/test/disabled/test-http-tls.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-https-loop-to-google.js b/test/disabled/test-https-loop-to-google.js
index ae9e1999eb7..bfa86630764 100644
--- a/test/disabled/test-https-loop-to-google.js
+++ b/test/disabled/test-https-loop-to-google.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Failing test for https
 
 // Will fail with "socket hang up" for 4 out of 10 requests
diff --git a/test/disabled/test-idle-watcher.js b/test/disabled/test-idle-watcher.js
index 86cebe41476..10e78612f5a 100644
--- a/test/disabled/test-idle-watcher.js
+++ b/test/disabled/test-idle-watcher.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-net-fd-passing.js b/test/disabled/test-net-fd-passing.js
index cda9f86a511..67a04b3736c 100644
--- a/test/disabled/test-net-fd-passing.js
+++ b/test/disabled/test-net-fd-passing.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
diff --git a/test/disabled/test-net-tls-pummel.js b/test/disabled/test-net-tls-pummel.js
index 27611151176..fa405be5799 100644
--- a/test/disabled/test-net-tls-pummel.js
+++ b/test/disabled/test-net-tls-pummel.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-net-tls.js b/test/disabled/test-net-tls.js
index 4214a68e6e0..d4620065d96 100644
--- a/test/disabled/test-net-tls.js
+++ b/test/disabled/test-net-tls.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
diff --git a/test/disabled/test-process-title.js b/test/disabled/test-process-title.js
index 9bffdc30742..a50fd8f591c 100644
--- a/test/disabled/test-process-title.js
+++ b/test/disabled/test-process-title.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
diff --git a/test/disabled/test-readline.js b/test/disabled/test-readline.js
index a0541aab07d..935216afc9a 100644
--- a/test/disabled/test-readline.js
+++ b/test/disabled/test-readline.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Can't test this when 'make test' doesn't assign a tty to the stdout.
 // Yet another use-case for require('tty').spawn ?
 var common = require('../common');
diff --git a/test/disabled/test-remote-module-loading.js b/test/disabled/test-remote-module-loading.js
index 5ce7bc1ed6c..7b9d7e223cc 100644
--- a/test/disabled/test-remote-module-loading.js
+++ b/test/disabled/test-remote-module-loading.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/test-setuidgid.js b/test/disabled/test-setuidgid.js
index f5a78211185..daf04b0c768 100644
--- a/test/disabled/test-setuidgid.js
+++ b/test/disabled/test-setuidgid.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Requires special privlages
 var common = require('../common');
 var assert = require('assert');
diff --git a/test/disabled/test-tls-large-push.js b/test/disabled/test-tls-large-push.js
index 11f9a0d80dc..55855f9e73c 100644
--- a/test/disabled/test-tls-large-push.js
+++ b/test/disabled/test-tls-large-push.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Server sends a large string. Client counts bytes and pauses every few
 // seconds. Makes sure that pause and resume work properly.
 var common = require('../common');
diff --git a/test/disabled/test-tls-server.js b/test/disabled/test-tls-server.js
index 0f2149883b2..9723920659d 100644
--- a/test/disabled/test-tls-server.js
+++ b/test/disabled/test-tls-server.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Example of new TLS API. Test with:
 //
 //     $> openssl s_client -connect localhost:12346 \
diff --git a/test/disabled/test-tty-stdio.js b/test/disabled/test-tty-stdio.js
index e41b68c1c8e..951ab10a0fd 100644
--- a/test/disabled/test-tty-stdio.js
+++ b/test/disabled/test-tty-stdio.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Can't test this when 'make test' doesn't assign a tty to the stdout.
 var common = require('../common');
 var assert = require('assert');
diff --git a/test/disabled/tls-client.js b/test/disabled/tls-client.js
index 169a52145cc..4ce9e581964 100644
--- a/test/disabled/tls-client.js
+++ b/test/disabled/tls-client.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var tls = require('tls');
 var fs = require('fs');
diff --git a/test/disabled/tls_client.js b/test/disabled/tls_client.js
index d574635b0ec..c9647b9bd26 100644
--- a/test/disabled/tls_client.js
+++ b/test/disabled/tls_client.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/disabled/tls_server.js b/test/disabled/tls_server.js
index ee25daad4bc..ac4b546ac0d 100644
--- a/test/disabled/tls_server.js
+++ b/test/disabled/tls_server.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/message/2100bytes.js b/test/message/2100bytes.js
index 2e76d86f927..90dac6d006f 100644
--- a/test/message/2100bytes.js
+++ b/test/message/2100bytes.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var util = require('util');
diff --git a/test/message/hello_world.js b/test/message/hello_world.js
index 4fef1f300a4..f9100e666df 100644
--- a/test/message/hello_world.js
+++ b/test/message/hello_world.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/message/stack_overflow.js b/test/message/stack_overflow.js
index d8f89f0c526..a5af04e0e2b 100644
--- a/test/message/stack_overflow.js
+++ b/test/message/stack_overflow.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/message/throw_custom_error.js b/test/message/throw_custom_error.js
index ef9fd3e0f77..8479daa6860 100644
--- a/test/message/throw_custom_error.js
+++ b/test/message/throw_custom_error.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/message/throw_non_error.js b/test/message/throw_non_error.js
index 9d5d4a96114..24eac3aeced 100644
--- a/test/message/throw_non_error.js
+++ b/test/message/throw_non_error.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/message/undefined_reference_in_new_context.js b/test/message/undefined_reference_in_new_context.js
index faa25fdb9b0..49c2f1420c9 100644
--- a/test/message/undefined_reference_in_new_context.js
+++ b/test/message/undefined_reference_in_new_context.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/pummel/test-child-process-spawn-loop.js b/test/pummel/test-child-process-spawn-loop.js
index 25d0eee5e50..121cddb01dd 100644
--- a/test/pummel/test-child-process-spawn-loop.js
+++ b/test/pummel/test-child-process-spawn-loop.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/pummel/test-exec.js b/test/pummel/test-exec.js
index 92b061ff636..87dff6c36d8 100644
--- a/test/pummel/test-exec.js
+++ b/test/pummel/test-exec.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
diff --git a/test/pummel/test-https-large-response.js b/test/pummel/test-https-large-response.js
index b29114a48b9..b1e308ae69c 100644
--- a/test/pummel/test-https-large-response.js
+++ b/test/pummel/test-https-large-response.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/pummel/test-keep-alive.js b/test/pummel/test-keep-alive.js
index d1cf3cfbc57..e9e3286a4a2 100644
--- a/test/pummel/test-keep-alive.js
+++ b/test/pummel/test-keep-alive.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This test requires the program 'ab'
 var common = require('../common');
 var assert = require('assert');
diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index 99eeb3a7903..d0c9086f907 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
diff --git a/test/pummel/test-net-throttle.js b/test/pummel/test-net-throttle.js
index 57417f7f2da..50c4fd89cd9 100644
--- a/test/pummel/test-net-throttle.js
+++ b/test/pummel/test-net-throttle.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
diff --git a/test/pummel/test-next-tick-loops-quick.js b/test/pummel/test-next-tick-loops-quick.js
index 2b941d017b9..f08972c68b2 100644
--- a/test/pummel/test-next-tick-loops-quick.js
+++ b/test/pummel/test-next-tick-loops-quick.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/pummel/test-process-uptime.js b/test/pummel/test-process-uptime.js
index 33a58f6562c..b4d09d35c5c 100644
--- a/test/pummel/test-process-uptime.js
+++ b/test/pummel/test-process-uptime.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var assert = require('assert');
 
 console.error(process.uptime());
diff --git a/test/pummel/test-tls-throttle.js b/test/pummel/test-tls-throttle.js
index 4f353cadd7a..cd749d511c8 100644
--- a/test/pummel/test-tls-throttle.js
+++ b/test/pummel/test-tls-throttle.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Server sends a large string. Client counts bytes and pauses every few
 // seconds. Makes sure that pause and resume work properly.
 var common = require('../common');
diff --git a/test/pummel/test-watch-file.js b/test/pummel/test-watch-file.js
index 04a7f13e21c..bd387166747 100644
--- a/test/pummel/test-watch-file.js
+++ b/test/pummel/test-watch-file.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/path.js b/test/simple/path.js
index d998c39713e..cdf1c06b2fd 100644
--- a/test/simple/path.js
+++ b/test/simple/path.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This is actually more a fixture than a test. It is used to make
 // sure that require('./path') and require('path') do different things.
 // It has to be in the same directory as the test 'test-module-loading.js'
diff --git a/test/simple/test-child-process-custom-fds.js b/test/simple/test-child-process-custom-fds.js
index d4e4a47afd4..690f89d6d75 100644
--- a/test/simple/test-child-process-custom-fds.js
+++ b/test/simple/test-child-process-custom-fds.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-child-process-double-pipe.js b/test/simple/test-child-process-double-pipe.js
index 7322cbefb22..64ac85ed0a5 100644
--- a/test/simple/test-child-process-double-pipe.js
+++ b/test/simple/test-child-process-double-pipe.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var assert = require('assert'),
     util = require('util'),
     spawn = require('child_process').spawn;
diff --git a/test/simple/test-child-process-exec-env.js b/test/simple/test-child-process-exec-env.js
index 68fca60f02b..faf4b37af0b 100644
--- a/test/simple/test-child-process-exec-env.js
+++ b/test/simple/test-child-process-exec-env.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
diff --git a/test/simple/test-child-process-kill.js b/test/simple/test-child-process-kill.js
index 65d858a8647..0e1d191dff6 100644
--- a/test/simple/test-child-process-kill.js
+++ b/test/simple/test-child-process-kill.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-child-process-stdout-flush.js b/test/simple/test-child-process-stdout-flush.js
index 096a583081a..b2060005bbd 100644
--- a/test/simple/test-child-process-stdout-flush.js
+++ b/test/simple/test-child-process-stdout-flush.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-cli-eval.js b/test/simple/test-cli-eval.js
index bf6271bea48..66052e15340 100644
--- a/test/simple/test-cli-eval.js
+++ b/test/simple/test-cli-eval.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 assert = require('assert');
 child = require('child_process');
 
diff --git a/test/simple/test-console-not-call-toString.js b/test/simple/test-console-not-call-toString.js
index c519decaa57..5193f29c34c 100644
--- a/test/simple/test-console-not-call-toString.js
+++ b/test/simple/test-console-not-call-toString.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-console.js b/test/simple/test-console.js
index e9fd5e6c0fc..4ec37292fc1 100644
--- a/test/simple/test-console.js
+++ b/test/simple/test-console.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-crypto.js b/test/simple/test-crypto.js
index 9c7fc291063..48cef1d4fac 100644
--- a/test/simple/test-crypto.js
+++ b/test/simple/test-crypto.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-debugger-client.js b/test/simple/test-debugger-client.js
index ed039687c4c..19f2e49a387 100644
--- a/test/simple/test-debugger-client.js
+++ b/test/simple/test-debugger-client.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var debug = require('_debugger');
diff --git a/test/simple/test-dgram-multicast.js b/test/simple/test-dgram-multicast.js
index 1a610f61769..f3a546fb20b 100644
--- a/test/simple/test-dgram-multicast.js
+++ b/test/simple/test-dgram-multicast.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-dgram-pingpong.js b/test/simple/test-dgram-pingpong.js
index 2ff3aec0094..4f0360f922a 100644
--- a/test/simple/test-dgram-pingpong.js
+++ b/test/simple/test-dgram-pingpong.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var Buffer = require('buffer').Buffer;
diff --git a/test/simple/test-dgram-udp4.js b/test/simple/test-dgram-udp4.js
index e4fd634f46b..1f343af8954 100644
--- a/test/simple/test-dgram-udp4.js
+++ b/test/simple/test-dgram-udp4.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-dgram-unix-anon.js b/test/simple/test-dgram-unix-anon.js
index 428a62bb2f3..860c68c2513 100644
--- a/test/simple/test-dgram-unix-anon.js
+++ b/test/simple/test-dgram-unix-anon.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-dgram-unix.js b/test/simple/test-dgram-unix.js
index 382906369d8..bb526696bd2 100644
--- a/test/simple/test-dgram-unix.js
+++ b/test/simple/test-dgram-unix.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-eio-race.js b/test/simple/test-eio-race.js
index f4c560cd9ee..f8ff2c793f5 100644
--- a/test/simple/test-eio-race.js
+++ b/test/simple/test-eio-race.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-error-reporting.js b/test/simple/test-error-reporting.js
index 8117b4527a0..df547422ca9 100644
--- a/test/simple/test-error-reporting.js
+++ b/test/simple/test-error-reporting.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
diff --git a/test/simple/test-eval-require.js b/test/simple/test-eval-require.js
index 6fcb73a0372..9648c1fb0b4 100644
--- a/test/simple/test-eval-require.js
+++ b/test/simple/test-eval-require.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
diff --git a/test/simple/test-eval.js b/test/simple/test-eval.js
index c3db977fa09..94f5c38b383 100644
--- a/test/simple/test-eval.js
+++ b/test/simple/test-eval.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
diff --git a/test/simple/test-exec-max-buffer.js b/test/simple/test-exec-max-buffer.js
index a6537e9f92c..a8e84c91f59 100644
--- a/test/simple/test-exec-max-buffer.js
+++ b/test/simple/test-exec-max-buffer.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var exec = require('child_process').exec;
 var assert = require('assert');
diff --git a/test/simple/test-fs-chmod.js b/test/simple/test-fs-chmod.js
index f9e7786a88f..ea1b35479c4 100644
--- a/test/simple/test-fs-chmod.js
+++ b/test/simple/test-fs-chmod.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-fs-error-messages.js b/test/simple/test-fs-error-messages.js
index 0a88c47988f..49f82ceda22 100644
--- a/test/simple/test-fs-error-messages.js
+++ b/test/simple/test-fs-error-messages.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-fs-read-buffer.js b/test/simple/test-fs-read-buffer.js
index a1a86c69720..ebc3af785d1 100644
--- a/test/simple/test-fs-read-buffer.js
+++ b/test/simple/test-fs-read-buffer.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path'),
diff --git a/test/simple/test-fs-read-stream.js b/test/simple/test-fs-read-stream.js
index 5362389fde1..46db1b72ec7 100644
--- a/test/simple/test-fs-read-stream.js
+++ b/test/simple/test-fs-read-stream.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-fs-read.js b/test/simple/test-fs-read.js
index 8e1960d9c3b..4095815b1c6 100644
--- a/test/simple/test-fs-read.js
+++ b/test/simple/test-fs-read.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path'),
diff --git a/test/simple/test-fs-realpath.js b/test/simple/test-fs-realpath.js
index eae45408895..0721a1277ea 100644
--- a/test/simple/test-fs-realpath.js
+++ b/test/simple/test-fs-realpath.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
diff --git a/test/simple/test-fs-stat.js b/test/simple/test-fs-stat.js
index 65332757b1f..8abe07a0e74 100644
--- a/test/simple/test-fs-stat.js
+++ b/test/simple/test-fs-stat.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
diff --git a/test/simple/test-fs-symlink.js b/test/simple/test-fs-symlink.js
index bb0eaadd0b8..a7a780bc554 100644
--- a/test/simple/test-fs-symlink.js
+++ b/test/simple/test-fs-symlink.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-fs-watch-file.js b/test/simple/test-fs-watch-file.js
index be037a12768..ceee9769144 100644
--- a/test/simple/test-fs-watch-file.js
+++ b/test/simple/test-fs-watch-file.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-http-304.js b/test/simple/test-http-304.js
index 9f53a05662c..85724e0b0db 100644
--- a/test/simple/test-http-304.js
+++ b/test/simple/test-http-304.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-http-agent.js b/test/simple/test-http-agent.js
index 2425a3cd540..de98e26054b 100644
--- a/test/simple/test-http-agent.js
+++ b/test/simple/test-http-agent.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-http-client-abort2.js b/test/simple/test-http-client-abort2.js
index c0c995b91d4..9df9a8c4ed6 100644
--- a/test/simple/test-http-client-abort2.js
+++ b/test/simple/test-http-client-abort2.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-http-full-response.js b/test/simple/test-http-full-response.js
index c52664c499b..cf5956fa1bb 100644
--- a/test/simple/test-http-full-response.js
+++ b/test/simple/test-http-full-response.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 // This test requires the program 'ab'
diff --git a/test/simple/test-http-get-pipeline-problem.js b/test/simple/test-http-get-pipeline-problem.js
index 9d250757291..7a1501f4abf 100644
--- a/test/simple/test-http-get-pipeline-problem.js
+++ b/test/simple/test-http-get-pipeline-problem.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // We are demonstrating a problem with http.get when queueing up many
 // transfers. The server simply introduces some delay and sends a file.
 // Note this is demonstarted with connection: close.
diff --git a/test/simple/test-http-head-response-has-no-body-end.js b/test/simple/test-http-head-response-has-no-body-end.js
index 1a175247151..2a111e56255 100644
--- a/test/simple/test-http-head-response-has-no-body-end.js
+++ b/test/simple/test-http-head-response-has-no-body-end.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-http-host-headers.js b/test/simple/test-http-host-headers.js
index 25ef56ea303..8a885d2695d 100644
--- a/test/simple/test-http-host-headers.js
+++ b/test/simple/test-http-host-headers.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var http = require('http'),
     https = require('https'),
     fs = require('fs'),
@@ -157,4 +160,4 @@ function testHttps() {
       setHost: false,
       port: common.PORT }, cb).on('error', thrower).end();
   });
-}
\ No newline at end of file
+}
diff --git a/test/simple/test-http-legacy.js b/test/simple/test-http-legacy.js
index ef828786881..331978709d3 100644
--- a/test/simple/test-http-legacy.js
+++ b/test/simple/test-http-legacy.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-http-request-end-twice.js b/test/simple/test-http-request-end-twice.js
index 5ab529e4809..dce95071f70 100644
--- a/test/simple/test-http-request-end-twice.js
+++ b/test/simple/test-http-request-end-twice.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-http-status-code.js b/test/simple/test-http-status-code.js
index 5edd81f959f..3c8b4fed093 100644
--- a/test/simple/test-http-status-code.js
+++ b/test/simple/test-http-status-code.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-https-agent.js b/test/simple/test-https-agent.js
index 03e5f71cca7..ccbd40fca97 100644
--- a/test/simple/test-https-agent.js
+++ b/test/simple/test-https-agent.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 if (!process.versions.openssl) {
   console.error("Skipping because node compiled without OpenSSL.");
   process.exit(0);
diff --git a/test/simple/test-https-connecting-to-http.js b/test/simple/test-https-connecting-to-http.js
index e7e2a299e3e..1ee969f646e 100644
--- a/test/simple/test-https-connecting-to-http.js
+++ b/test/simple/test-https-connecting-to-http.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This tests the situation where you try to connect a https client
 // to an http server. You should get an error and exit.
 var common = require('../common');
diff --git a/test/simple/test-https-eof-for-eom.js b/test/simple/test-https-eof-for-eom.js
index e043c5df8ac..3e09c0bfd7c 100644
--- a/test/simple/test-https-eof-for-eom.js
+++ b/test/simple/test-https-eof-for-eom.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // I hate HTTP. One way of terminating an HTTP response is to not send
 // a content-length header, not send a transfer-encoding: chunked header,
 // and simply terminate the TCP connection. That is identity
diff --git a/test/simple/test-https-simple.js b/test/simple/test-https-simple.js
index b9fed4c5700..b054b8eef5e 100644
--- a/test/simple/test-https-simple.js
+++ b/test/simple/test-https-simple.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 if (!process.versions.openssl) {
   console.error("Skipping because node compiled without OpenSSL.");
   process.exit(0);
diff --git a/test/simple/test-init.js b/test/simple/test-init.js
index 55a9b38a339..f5a45fab28e 100644
--- a/test/simple/test-init.js
+++ b/test/simple/test-init.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 (function() {
   var assert = require('assert'),
       child  = require('child_process'),
diff --git a/test/simple/test-listen-fd.js b/test/simple/test-listen-fd.js
index ae337a2d2e2..f84ec2e27a5 100644
--- a/test/simple/test-listen-fd.js
+++ b/test/simple/test-listen-fd.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Verify that net.Server.listenFD() can be used to accept connections on an
 // already-bound, already-listening socket.
 
diff --git a/test/simple/test-memory-usage.js b/test/simple/test-memory-usage.js
index b65dda45c8d..cf9a72f5793 100644
--- a/test/simple/test-memory-usage.js
+++ b/test/simple/test-memory-usage.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-module-loading.js b/test/simple/test-module-loading.js
index 7800cfba2fa..a5e0acf3afd 100644
--- a/test/simple/test-module-loading.js
+++ b/test/simple/test-module-loading.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-net-bytes-stats.js b/test/simple/test-net-bytes-stats.js
index 51603d5ca5d..639a401519b 100644
--- a/test/simple/test-net-bytes-stats.js
+++ b/test/simple/test-net-bytes-stats.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
diff --git a/test/simple/test-net-connect-handle-econnrefused.js b/test/simple/test-net-connect-handle-econnrefused.js
index 17e9d993fab..6009998ed95 100644
--- a/test/simple/test-net-connect-handle-econnrefused.js
+++ b/test/simple/test-net-connect-handle-econnrefused.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var net = require('net');
 var assert = require('assert');
diff --git a/test/simple/test-net-server-close.js b/test/simple/test-net-server-close.js
index 08f11194146..2262a99aa2b 100644
--- a/test/simple/test-net-server-close.js
+++ b/test/simple/test-net-server-close.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
diff --git a/test/simple/test-os.js b/test/simple/test-os.js
index 34bb4b28591..b4f97c13db4 100644
--- a/test/simple/test-os.js
+++ b/test/simple/test-os.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var os = require('os');
diff --git a/test/simple/test-pipe-head.js b/test/simple/test-pipe-head.js
index 636f90ceee5..88552006a0e 100644
--- a/test/simple/test-pipe-head.js
+++ b/test/simple/test-pipe-head.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-pipe-return-val.js b/test/simple/test-pipe-return-val.js
index f82b26e808a..c1ee5331bd5 100644
--- a/test/simple/test-pipe-return-val.js
+++ b/test/simple/test-pipe-return-val.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This test ensures SourceStream.pipe(DestStream) returns DestStream
 
 var Stream = require('stream').Stream;
diff --git a/test/simple/test-pipe.js b/test/simple/test-pipe.js
index b4a2c1a7f88..de89b0d2bb0 100644
--- a/test/simple/test-pipe.js
+++ b/test/simple/test-pipe.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
diff --git a/test/simple/test-process-kill-null.js b/test/simple/test-process-kill-null.js
index f61487e9ad1..b29fa7597c8 100644
--- a/test/simple/test-process-kill-null.js
+++ b/test/simple/test-process-kill-null.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 
 var assert = require('assert');
 var spawn = require('child_process').spawn;
@@ -38,4 +41,4 @@ cat.stdin.write('test');
 
 process.on('exit', function(){
   assert.ok(called);
-});
\ No newline at end of file
+});
diff --git a/test/simple/test-process-wrap.js b/test/simple/test-process-wrap.js
index b52f3fcbc4e..e6a9e4ebada 100644
--- a/test/simple/test-process-wrap.js
+++ b/test/simple/test-process-wrap.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var Process = process.binding('process_wrap').Process;
diff --git a/test/simple/test-regress-GH-892.js b/test/simple/test-regress-GH-892.js
index be1b07b7a25..960c4dbd075 100644
--- a/test/simple/test-regress-GH-892.js
+++ b/test/simple/test-regress-GH-892.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Uploading a big file via HTTPS causes node to drop out of the event loop.
 // https://github.com/joyent/node/issues/892
 // In this test we set up an HTTPS in this process and launch a subprocess
diff --git a/test/simple/test-sendfd.js b/test/simple/test-sendfd.js
index bb39c28f620..328d1989e18 100644
--- a/test/simple/test-sendfd.js
+++ b/test/simple/test-sendfd.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // Test sending and receiving a file descriptor.
 //
 // This test is pretty complex. It ends up spawning test/fixtures/recvfd.js
diff --git a/test/simple/test-sigint-infinite-loop.js b/test/simple/test-sigint-infinite-loop.js
index f970d9eed95..7478fd8f66e 100644
--- a/test/simple/test-sigint-infinite-loop.js
+++ b/test/simple/test-sigint-infinite-loop.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // This test is to assert that we can SIGINT a script which loops forever.
 // Ref(http):
 // groups.google.com/group/nodejs-dev/browse_thread/thread/e20f2f8df0296d3f
diff --git a/test/simple/test-signal-handler.js b/test/simple/test-signal-handler.js
index 2a3b72998fd..01552dcd2fa 100644
--- a/test/simple/test-signal-handler.js
+++ b/test/simple/test-signal-handler.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-signal-unregister.js b/test/simple/test-signal-unregister.js
index 0b3f04fa55c..80b308ab8d4 100644
--- a/test/simple/test-signal-unregister.js
+++ b/test/simple/test-signal-unregister.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 
diff --git a/test/simple/test-stdin-from-file.js b/test/simple/test-stdin-from-file.js
index b165e4c4e4f..37d8be52e11 100644
--- a/test/simple/test-stdin-from-file.js
+++ b/test/simple/test-stdin-from-file.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var join = require('path').join;
diff --git a/test/simple/test-stdout-to-file.js b/test/simple/test-stdout-to-file.js
index 9c99bcc19ff..4a5a2ecb87a 100644
--- a/test/simple/test-stdout-to-file.js
+++ b/test/simple/test-stdout-to-file.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-sync-fileread.js b/test/simple/test-sync-fileread.js
index cc161aa6487..78b87887cbc 100644
--- a/test/simple/test-sync-fileread.js
+++ b/test/simple/test-sync-fileread.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var path = require('path');
diff --git a/test/simple/test-tls-ext-key-usage.js b/test/simple/test-tls-ext-key-usage.js
index 57d2f3b882e..20b2a76b1ee 100644
--- a/test/simple/test-tls-ext-key-usage.js
+++ b/test/simple/test-tls-ext-key-usage.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // There is a bug with 'openssl s_server' which makes it not flush certain
 // important events to stdout when done over a pipe. Therefore we skip this
 // test for all openssl versions less than 1.0.0.
diff --git a/test/simple/test-tls-securepair-client.js b/test/simple/test-tls-securepair-client.js
index 48103960c02..8006a265355 100644
--- a/test/simple/test-tls-securepair-client.js
+++ b/test/simple/test-tls-securepair-client.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 // There is a bug with 'openssl s_server' which makes it not flush certain
 // important events to stdout when done over a pipe. Therefore we skip this
 // test for all openssl versions less than 1.0.0.
diff --git a/test/simple/test-tls-server-verify.js b/test/simple/test-tls-server-verify.js
index ce4ac567c01..05a8a4aa92b 100644
--- a/test/simple/test-tls-server-verify.js
+++ b/test/simple/test-tls-server-verify.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 if (!process.versions.openssl) {
   console.error("Skipping because node compiled without OpenSSL.");
   process.exit(0);
diff --git a/test/simple/test-tls-sni-server-client.js b/test/simple/test-tls-sni-server-client.js
index 526d6502f4d..eeee66a4a2b 100644
--- a/test/simple/test-tls-sni-server-client.js
+++ b/test/simple/test-tls-sni-server-client.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 if (!process.features.tls_sni) {
   console.error("Skipping because node compiled without OpenSSL or " +
                 "with old OpenSSL version.");
diff --git a/test/simple/test-util-format.js b/test/simple/test-util-format.js
index e9c28c2de59..d7eecfacef4 100644
--- a/test/simple/test-util-format.js
+++ b/test/simple/test-util-format.js
@@ -19,6 +19,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+// libuv-broken
+
+
 var common = require('../common');
 var assert = require('assert');
 var util = require('util');