diff --git a/Makefile b/Makefile
index 2a092fbfed..868efdd81b 100644
--- a/Makefile
+++ b/Makefile
@@ -61,10 +61,131 @@ test-internet: all
 	python tools/test.py internet
 
 test-uv: all
-	python tools/test.py \
+	NODE_USE_UV=1 python tools/test.py \
+		simple/test-assert \
+		simple/test-buffer \
+		simple/test-c-ares \
+		simple/test-chdir \
+		simple/test-delayed-require \
+		simple/test-eio-race2 \
+		simple/test-eio-race4 \
+		simple/test-event-emitter-add-listeners \
+		simple/test-event-emitter-modify-in-emit \
+		simple/test-event-emitter-num-args \
+		simple/test-event-emitter-once \
+		simple/test-event-emitter-remove-all-listeners \
+		simple/test-event-emitter-remove-listeners \
+		simple/test-exception-handler \
+		simple/test-exception-handler2 \
+		simple/test-exception-handler \
+		simple/test-file-read-noexist \
+		simple/test-file-write-stream \
+		simple/test-fs-fsync \
+		simple/test-fs-open \
+		simple/test-fs-readfile-empty \
+		simple/test-fs-read-file-sync \
+		simple/test-fs-read-file-sync-hostname \
+		simple/test-fs-sir-writes-alot \
+		simple/test-fs-write \
+		simple/test-fs-write-buffer \
+		simple/test-fs-write-file \
+		simple/test-fs-write-file-buffer \
+		simple/test-fs-write-stream \
+		simple/test-fs-write-stream-end \
+		simple/test-fs-write-sync \
+		simple/test-global \
+		simple/test-http \
+		simple/test-http-1.0 \
+		simple/test-http-allow-req-after-204-res \
+		simple/test-http-blank-header \
+		simple/test-http-buffer-sanity \
+		simple/test-http-cat \
+		simple/test-http-chunked \
+		simple/test-http-client-race \
+		simple/test-http-client-race-2 \
+		simple/test-http-client-upload \
+		simple/test-http-client-upload-buf \
+		simple/test-http-contentLength0 \
+		simple/test-http-dns-fail \
+		simple/test-http-eof-on-connect \
+		simple/test-http-exceptions \
+		simple/test-http-expect-continue \
+		simple/test-http-head-request \
+		simple/test-http-head-response-has-no-body \
+		simple/test-http-keep-alive \
+		simple/test-http-keep-alive-close-on-header \
+		simple/test-http-malformed-request \
+		simple/test-http-parser \
+		simple/test-http-proxy \
+		simple/test-http-server \
+		simple/test-http-server-multiheaders \
+		simple/test-http-set-cookies \
+		simple/test-http-set-timeout \
+		simple/test-http-set-trailers \
+		simple/test-http-upgrade-client \
+		simple/test-http-upgrade-client2 \
+		simple/test-http-upgrade-server \
+		simple/test-http-upgrade-server2 \
+		simple/test-http-wget \
+		simple/test-http-write-empty-string \
+		simple/test-http-wget \
+		simple/test-mkdir-rmdir \
+		simple/test-net-binary \
+		simple/test-net-can-reset-timeout \
+		simple/test-net-create-connection \
 		simple/test-net-eaddrinuse \
+		simple/test-net-isip \
+		simple/test-net-keepalive \
 		simple/test-net-pingpong \
-		simple/test-net-reconnect
+		simple/test-net-remote-address-port \
+		simple/test-net-server-try-ports \
+		simple/test-net-server-stream \
+		simple/test-next-tick \
+		simple/test-next-tick-errors \
+		simple/test-next-tick-ordering \
+		simple/test-next-tick-ordering2 \
+		simple/test-path \
+		simple/test-pump-file2tcp \
+		simple/test-pump-file2tcp-noexist \
+		simple/test-punycode \
+		simple/test-querystring \
+		simple/test-readdir \
+		simple/test-readdouble \
+		simple/test-readfloat \
+		simple/test-readint \
+		simple/test-readuint \
+		simple/test-regress-GH-819 \
+		simple/test-regress-GH-897 \
+		simple/test-regression-object-prototype \
+		simple/test-require-cache \
+		simple/test-require-cache-without-stat \
+		simple/test-require-exceptions \
+		simple/test-require-resolve \
+		simple/test-script-context \
+		simple/test-script-new \
+		simple/test-script-static-context \
+		simple/test-script-static-new \
+		simple/test-script-static-this \
+		simple/test-script-this \
+		simple/test-stream-pipe-cleanup \
+		simple/test-stream-pipe-error-handling \
+		simple/test-stream-pipe-event \
+		simple/test-stream-pipe-multi \
+		simple/test-string-decoder \
+		simple/test-sys \
+		simple/test-tcp-wrap \
+		simple/test-tcp-wrap-connect \
+		simple/test-tcp-wrap-listen \
+		simple/test-timers-linked-list \
+		simple/test-tty-stdout-end \
+		simple/test-url \
+		simple/test-utf8-scripts \
+		simple/test-vm-create-context-circular-reference \
+		simple/test-writedouble \
+		simple/test-writefloat \
+		simple/test-writeint \
+		simple/test-writeuint \
+		simple/test-zerolengthbufferbug \
 
 
 build/default/node: all