diff --git a/fs/test.ts b/fs/test.ts
new file mode 100644
index 0000000000..5cff8e1746
--- /dev/null
+++ b/fs/test.ts
@@ -0,0 +1,13 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+import "./path/test.ts";
+import "./walk_test.ts";
+import "./globrex_test.ts";
+import "./glob_test.ts";
+import "./exists_test.ts";
+import "./empty_dir_test.ts";
+import "./ensure_dir_test.ts";
+import "./ensure_file_test.ts";
+import "./move_test.ts";
+import "./read_json_test.ts";
+import "./write_json_test.ts";
+import "./utils_test.ts";
diff --git a/http/test.ts b/http/test.ts
new file mode 100644
index 0000000000..25b8af79f0
--- /dev/null
+++ b/http/test.ts
@@ -0,0 +1,3 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+import "./server_test.ts";
+import "./file_server_test.ts";
diff --git a/io/test.ts b/io/test.ts
index b414e65057..a5c942aef9 100644
--- a/io/test.ts
+++ b/io/test.ts
@@ -1,3 +1,6 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import "./bufio_test.ts";
 import "./ioutil_test.ts";
 import "./util_test.ts";
+import "./writers_test.ts";
+import "./readers_test.ts";
diff --git a/multipart/test.ts b/multipart/test.ts
new file mode 100644
index 0000000000..89678d96d9
--- /dev/null
+++ b/multipart/test.ts
@@ -0,0 +1,3 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+import "./formfile_test.ts";
+import "./multipart_test.ts";
diff --git a/prettier/test.ts b/prettier/test.ts
new file mode 100644
index 0000000000..d2d1eabd75
--- /dev/null
+++ b/prettier/test.ts
@@ -0,0 +1 @@
+import "./main_test.ts";
diff --git a/strings/test.ts b/strings/test.ts
new file mode 100644
index 0000000000..d0d96aa083
--- /dev/null
+++ b/strings/test.ts
@@ -0,0 +1,2 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+import "./pad_test.ts";
diff --git a/test.ts b/test.ts
index 0cf95fde09..7e3af53136 100755
--- a/test.ts
+++ b/test.ts
@@ -4,32 +4,15 @@ import "./colors/test.ts";
 import "./datetime/test.ts";
 import "./examples/test.ts";
 import "./flags/test.ts";
-import "./io/bufio_test.ts";
-import "./io/ioutil_test.ts";
-import "./io/util_test.ts";
-import "./io/writers_test.ts";
-import "./io/readers_test.ts";
-import "./fs/path/test.ts";
-import "./fs/walk_test.ts";
-import "./fs/globrex_test.ts";
-import "./fs/glob_test.ts";
-import "./fs/exists_test.ts";
-import "./fs/empty_dir_test.ts";
-import "./fs/ensure_dir_test.ts";
-import "./fs/ensure_file_test.ts";
-import "./fs/move_test.ts";
-import "./fs/read_json_test.ts";
-import "./fs/write_json_test.ts";
-import "./fs/utils_test.ts";
 import "./io/test.ts";
-import "./http/server_test.ts";
-import "./http/file_server_test.ts";
+import "./fs/test.ts";
+import "./io/test.ts";
+import "./http/test.ts";
 import "./log/test.ts";
 import "./media_types/test.ts";
-import "./multipart/formfile_test.ts";
-import "./multipart/multipart_test.ts";
-import "./prettier/main_test.ts";
-import "./strings/pad_test.ts";
+import "./multipart/test.ts";
+import "./prettier/test.ts";
+import "./strings/test.ts";
 import "./testing/test.ts";
 import "./textproto/test.ts";
 import "./ws/test.ts";