diff --git a/multipart/multipart.ts b/mime/multipart.ts
similarity index 99%
rename from multipart/multipart.ts
rename to mime/multipart.ts
index 0032e1cf54da..672b407c2e21 100644
--- a/multipart/multipart.ts
+++ b/mime/multipart.ts
@@ -5,7 +5,7 @@ type Closer = Deno.Closer;
 type Reader = Deno.Reader;
 type ReadResult = Deno.ReadResult;
 type Writer = Deno.Writer;
-import { FormFile } from "./formfile.ts";
+import { FormFile } from "../multipart/formfile.ts";
 import {
   bytesFindIndex,
   bytesFindLastIndex,
diff --git a/multipart/multipart_test.ts b/mime/multipart_test.ts
similarity index 98%
rename from multipart/multipart_test.ts
rename to mime/multipart_test.ts
index ba4f05116d85..d7583cf23077 100644
--- a/multipart/multipart_test.ts
+++ b/mime/multipart_test.ts
@@ -15,7 +15,7 @@ import {
   scanUntilBoundary
 } from "./multipart.ts";
 import * as path from "../fs/path.ts";
-import { FormFile, isFormFile } from "./formfile.ts";
+import { FormFile, isFormFile } from "../multipart/formfile.ts";
 import { StringWriter } from "../io/writers.ts";
 
 const e = new TextEncoder();
diff --git a/mime/test.ts b/mime/test.ts
new file mode 100644
index 000000000000..e8bbfada9604
--- /dev/null
+++ b/mime/test.ts
@@ -0,0 +1,2 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+import "./multipart_test.ts";
diff --git a/multipart/test.ts b/multipart/test.ts
index 89678d96d9e1..9adde5158e09 100644
--- a/multipart/test.ts
+++ b/multipart/test.ts
@@ -1,3 +1,2 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import "./formfile_test.ts";
-import "./multipart_test.ts";
diff --git a/test.ts b/test.ts
index 221bbc9858b8..fa44c3044442 100755
--- a/test.ts
+++ b/test.ts
@@ -10,6 +10,7 @@ import "./http/test.ts";
 import "./io/test.ts";
 import "./log/test.ts";
 import "./media_types/test.ts";
+import "./mime/test.ts";
 import "./multipart/test.ts";
 import "./prettier/test.ts";
 import "./strings/test.ts";