diff --git a/Cargo.lock b/Cargo.lock
index 3f3d372e45c..0c1218d2f7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1952,28 +1952,6 @@ dependencies = [
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "net_tests"
-version = "0.0.1"
-dependencies = [
- "cookie 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "devtools_traits 0.0.1",
- "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-openssl 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper_serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "msg 0.0.1",
- "net 0.0.1",
- "net_traits 0.0.1",
- "profile_traits 0.0.1",
- "servo_config 0.0.1",
- "servo_url 0.0.1",
- "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "net_traits"
 version = "0.0.1"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 23998be349d..da9a2c7393a 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -8,6 +8,8 @@ publish = false
 [lib]
 name = "net"
 path = "lib.rs"
+test = false
+doctest = false
 
 [dependencies]
 base64 = "0.6"
@@ -43,3 +45,7 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 
 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
 tinyfiledialogs = "2.5.9"
+
+[[test]]
+name = "main"
+path = "tests/main.rs"
diff --git a/tests/unit/net/chrome_loader.rs b/components/net/tests/chrome_loader.rs
similarity index 100%
rename from tests/unit/net/chrome_loader.rs
rename to components/net/tests/chrome_loader.rs
diff --git a/tests/unit/net/cookie.rs b/components/net/tests/cookie.rs
similarity index 100%
rename from tests/unit/net/cookie.rs
rename to components/net/tests/cookie.rs
diff --git a/tests/unit/net/cookie_http_state.rs b/components/net/tests/cookie_http_state.rs
similarity index 100%
rename from tests/unit/net/cookie_http_state.rs
rename to components/net/tests/cookie_http_state.rs
diff --git a/tests/unit/net/cookie_http_state_utils.py b/components/net/tests/cookie_http_state_utils.py
similarity index 100%
rename from tests/unit/net/cookie_http_state_utils.py
rename to components/net/tests/cookie_http_state_utils.py
diff --git a/tests/unit/net/data_loader.rs b/components/net/tests/data_loader.rs
similarity index 100%
rename from tests/unit/net/data_loader.rs
rename to components/net/tests/data_loader.rs
diff --git a/tests/unit/net/fetch.rs b/components/net/tests/fetch.rs
similarity index 100%
rename from tests/unit/net/fetch.rs
rename to components/net/tests/fetch.rs
diff --git a/tests/unit/net/file_loader.rs b/components/net/tests/file_loader.rs
similarity index 93%
rename from tests/unit/net/file_loader.rs
rename to components/net/tests/file_loader.rs
index 31d20812222..f7a45691e57 100644
--- a/tests/unit/net/file_loader.rs
+++ b/components/net/tests/file_loader.rs
@@ -8,7 +8,7 @@ use url::Url;
 #[test]
 fn load_htm() {
     let mut path = env::current_dir().expect("didn't get working dir");
-    path.push("test.jpeg");
+    path.push("tests/test.jpeg");
 
     let canon_path = path.canonicalize().expect("file path doesn't exist");
     let url = Url::from_file_path(canon_path);
diff --git a/tests/unit/net/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs
similarity index 91%
rename from tests/unit/net/filemanager_thread.rs
rename to components/net/tests/filemanager_thread.rs
index 1ca283f7145..089e56c43fb 100644
--- a/tests/unit/net/filemanager_thread.rs
+++ b/components/net/tests/filemanager_thread.rs
@@ -16,11 +16,11 @@ pub struct TestProvider;
 
 impl UIProvider for TestProvider {
     fn open_file_dialog(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<String> {
-        Some("test.jpeg".to_string())
+        Some("tests/test.jpeg".to_string())
     }
 
     fn open_file_dialog_multi(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
-        Some(vec!["test.jpeg".to_string()])
+        Some(vec!["tests/test.jpeg".to_string()])
     }
 }
 
@@ -28,18 +28,18 @@ impl UIProvider for TestProvider {
 fn test_filemanager() {
     let filemanager = FileManager::new();
 
-    // Try to open a dummy file "tests/unit/net/test.jpeg" in tree
-    let mut handler = File::open("test.jpeg").expect("test.jpeg is stolen");
+    // Try to open a dummy file "components/net/tests/test.jpeg" in tree
+    let mut handler = File::open("tests/test.jpeg").expect("test.jpeg is stolen");
     let mut test_file_content = vec![];
 
     handler.read_to_end(&mut test_file_content)
-           .expect("Read tests/unit/net/test.jpeg error");
+           .expect("Read components/net/tests/test.jpeg error");
 
     let patterns = vec![FilterPattern(".txt".to_string())];
     let origin = "test.com".to_string();
 
     {
-        // Try to select a dummy file "tests/unit/net/test.jpeg"
+        // Try to select a dummy file "components/net/tests/test.jpeg"
         let (tx, rx) = ipc::channel().unwrap();
         filemanager.handle(FileManagerThreadMsg::SelectFile(patterns.clone(), tx, origin.clone(), None),
                            TEST_PROVIDER);
diff --git a/tests/unit/net/hsts.rs b/components/net/tests/hsts.rs
similarity index 100%
rename from tests/unit/net/hsts.rs
rename to components/net/tests/hsts.rs
diff --git a/tests/unit/net/http_loader.rs b/components/net/tests/http_loader.rs
similarity index 100%
rename from tests/unit/net/http_loader.rs
rename to components/net/tests/http_loader.rs
diff --git a/tests/unit/net/lib.rs b/components/net/tests/main.rs
similarity index 100%
rename from tests/unit/net/lib.rs
rename to components/net/tests/main.rs
diff --git a/tests/unit/net/mime_classifier.rs b/components/net/tests/mime_classifier.rs
similarity index 99%
rename from tests/unit/net/mime_classifier.rs
rename to components/net/tests/mime_classifier.rs
index e8622b94b84..1a4757ded5f 100644
--- a/tests/unit/net/mime_classifier.rs
+++ b/components/net/tests/mime_classifier.rs
@@ -23,7 +23,7 @@ fn read_file(path: &path::Path) -> io::Result<Vec<u8>> {
 fn test_sniff_mp4_matcher() {
     let matcher = Mp4Matcher;
 
-    let p = PathBuf::from("parsable_mime/video/mp4/test.mp4");
+    let p = PathBuf::from("tests/parsable_mime/video/mp4/test.mp4");
     let read_result = read_file(&p);
 
     match read_result {
@@ -66,7 +66,7 @@ fn test_sniff_with_flags(filename_orig: &path::Path,
     let current_working_directory = env::current_dir().unwrap();
     println!("The current directory is {}", current_working_directory.display());
 
-    let mut filename = PathBuf::from("parsable_mime/");
+    let mut filename = PathBuf::from("tests/parsable_mime/");
     filename.push(filename_orig);
 
     let classifier = MimeClassifier::new();
diff --git a/tests/unit/net/parsable_mime/application/font-woff/test.wof b/components/net/tests/parsable_mime/application/font-woff/test.wof
similarity index 100%
rename from tests/unit/net/parsable_mime/application/font-woff/test.wof
rename to components/net/tests/parsable_mime/application/font-woff/test.wof
diff --git a/tests/unit/net/parsable_mime/application/ogg/small.ogg b/components/net/tests/parsable_mime/application/ogg/small.ogg
similarity index 100%
rename from tests/unit/net/parsable_mime/application/ogg/small.ogg
rename to components/net/tests/parsable_mime/application/ogg/small.ogg
diff --git a/tests/unit/net/parsable_mime/application/pdf/test.pdf b/components/net/tests/parsable_mime/application/pdf/test.pdf
similarity index 100%
rename from tests/unit/net/parsable_mime/application/pdf/test.pdf
rename to components/net/tests/parsable_mime/application/pdf/test.pdf
diff --git a/tests/unit/net/parsable_mime/application/postscript/test.ps b/components/net/tests/parsable_mime/application/postscript/test.ps
similarity index 100%
rename from tests/unit/net/parsable_mime/application/postscript/test.ps
rename to components/net/tests/parsable_mime/application/postscript/test.ps
diff --git a/tests/unit/net/parsable_mime/application/vnd.ms-fontobject/vnd.ms-fontobject b/components/net/tests/parsable_mime/application/vnd.ms-fontobject/vnd.ms-fontobject
similarity index 100%
rename from tests/unit/net/parsable_mime/application/vnd.ms-fontobject/vnd.ms-fontobject
rename to components/net/tests/parsable_mime/application/vnd.ms-fontobject/vnd.ms-fontobject
diff --git a/tests/unit/net/parsable_mime/application/x-gzip/test.gz b/components/net/tests/parsable_mime/application/x-gzip/test.gz
similarity index 100%
rename from tests/unit/net/parsable_mime/application/x-gzip/test.gz
rename to components/net/tests/parsable_mime/application/x-gzip/test.gz
diff --git a/tests/unit/net/parsable_mime/application/x-rar-compressed/test.rar b/components/net/tests/parsable_mime/application/x-rar-compressed/test.rar
similarity index 100%
rename from tests/unit/net/parsable_mime/application/x-rar-compressed/test.rar
rename to components/net/tests/parsable_mime/application/x-rar-compressed/test.rar
diff --git a/tests/unit/net/parsable_mime/application/zip/test.zip b/components/net/tests/parsable_mime/application/zip/test.zip
similarity index 100%
rename from tests/unit/net/parsable_mime/application/zip/test.zip
rename to components/net/tests/parsable_mime/application/zip/test.zip
diff --git a/tests/unit/net/parsable_mime/audio/aiff/test.aif b/components/net/tests/parsable_mime/audio/aiff/test.aif
similarity index 100%
rename from tests/unit/net/parsable_mime/audio/aiff/test.aif
rename to components/net/tests/parsable_mime/audio/aiff/test.aif
diff --git a/tests/unit/net/parsable_mime/audio/basic/test.au b/components/net/tests/parsable_mime/audio/basic/test.au
similarity index 100%
rename from tests/unit/net/parsable_mime/audio/basic/test.au
rename to components/net/tests/parsable_mime/audio/basic/test.au
diff --git a/tests/unit/net/parsable_mime/audio/midi/test.mid b/components/net/tests/parsable_mime/audio/midi/test.mid
similarity index 100%
rename from tests/unit/net/parsable_mime/audio/midi/test.mid
rename to components/net/tests/parsable_mime/audio/midi/test.mid
diff --git a/tests/unit/net/parsable_mime/audio/mpeg/test.mp3 b/components/net/tests/parsable_mime/audio/mpeg/test.mp3
similarity index 100%
rename from tests/unit/net/parsable_mime/audio/mpeg/test.mp3
rename to components/net/tests/parsable_mime/audio/mpeg/test.mp3
diff --git a/tests/unit/net/parsable_mime/audio/wave/test.wav b/components/net/tests/parsable_mime/audio/wave/test.wav
similarity index 100%
rename from tests/unit/net/parsable_mime/audio/wave/test.wav
rename to components/net/tests/parsable_mime/audio/wave/test.wav
diff --git a/tests/unit/net/parsable_mime/image/bmp/test.bmp b/components/net/tests/parsable_mime/image/bmp/test.bmp
similarity index 100%
rename from tests/unit/net/parsable_mime/image/bmp/test.bmp
rename to components/net/tests/parsable_mime/image/bmp/test.bmp
diff --git a/tests/unit/net/parsable_mime/image/gif/test87a b/components/net/tests/parsable_mime/image/gif/test87a
similarity index 100%
rename from tests/unit/net/parsable_mime/image/gif/test87a
rename to components/net/tests/parsable_mime/image/gif/test87a
diff --git a/tests/unit/net/parsable_mime/image/gif/test89a.gif b/components/net/tests/parsable_mime/image/gif/test89a.gif
similarity index 100%
rename from tests/unit/net/parsable_mime/image/gif/test89a.gif
rename to components/net/tests/parsable_mime/image/gif/test89a.gif
diff --git a/tests/unit/net/parsable_mime/image/jpeg/test.jpg b/components/net/tests/parsable_mime/image/jpeg/test.jpg
similarity index 100%
rename from tests/unit/net/parsable_mime/image/jpeg/test.jpg
rename to components/net/tests/parsable_mime/image/jpeg/test.jpg
diff --git a/tests/unit/net/parsable_mime/image/png/test.png b/components/net/tests/parsable_mime/image/png/test.png
similarity index 100%
rename from tests/unit/net/parsable_mime/image/png/test.png
rename to components/net/tests/parsable_mime/image/png/test.png
diff --git a/tests/unit/net/parsable_mime/image/webp/test.webp b/components/net/tests/parsable_mime/image/webp/test.webp
similarity index 100%
rename from tests/unit/net/parsable_mime/image/webp/test.webp
rename to components/net/tests/parsable_mime/image/webp/test.webp
diff --git a/tests/unit/net/parsable_mime/image/x-icon/test.ico b/components/net/tests/parsable_mime/image/x-icon/test.ico
similarity index 100%
rename from tests/unit/net/parsable_mime/image/x-icon/test.ico
rename to components/net/tests/parsable_mime/image/x-icon/test.ico
diff --git a/tests/unit/net/parsable_mime/image/x-icon/test_cursor.ico b/components/net/tests/parsable_mime/image/x-icon/test_cursor.ico
similarity index 100%
rename from tests/unit/net/parsable_mime/image/x-icon/test_cursor.ico
rename to components/net/tests/parsable_mime/image/x-icon/test_cursor.ico
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_a_20.html b/components/net/tests/parsable_mime/text/html/text_html_a_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_a_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_a_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_a_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_a_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_a_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_a_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_a_3e.html b/components/net/tests/parsable_mime/text/html/text_html_a_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_a_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_a_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_a_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_a_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_a_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_a_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_b_20.html b/components/net/tests/parsable_mime/text/html/text_html_b_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_b_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_b_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_b_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_b_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_b_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_b_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_b_3e.html b/components/net/tests/parsable_mime/text/html/text_html_b_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_b_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_b_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_b_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_b_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_b_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_b_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_body_20.html b/components/net/tests/parsable_mime/text/html/text_html_body_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_body_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_body_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_body_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_body_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_body_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_body_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_body_3e.html b/components/net/tests/parsable_mime/text/html/text_html_body_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_body_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_body_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_body_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_body_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_body_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_body_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_br_20.html b/components/net/tests/parsable_mime/text/html/text_html_br_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_br_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_br_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_br_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_br_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_br_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_br_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_br_3e.html b/components/net/tests/parsable_mime/text/html/text_html_br_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_br_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_br_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_br_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_br_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_br_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_br_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_comment_20.html b/components/net/tests/parsable_mime/text/html/text_html_comment_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_comment_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_comment_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_comment_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_comment_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_comment_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_comment_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_comment_3e.html b/components/net/tests/parsable_mime/text/html/text_html_comment_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_comment_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_comment_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_comment_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_comment_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_comment_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_comment_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_div_20.html b/components/net/tests/parsable_mime/text/html/text_html_div_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_div_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_div_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_div_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_div_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_div_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_div_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_div_3e.html b/components/net/tests/parsable_mime/text/html/text_html_div_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_div_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_div_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_div_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_div_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_div_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_div_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_doctype_20.html b/components/net/tests/parsable_mime/text/html/text_html_doctype_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_doctype_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_doctype_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_doctype_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_doctype_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_doctype_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_doctype_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_doctype_3e.html b/components/net/tests/parsable_mime/text/html/text_html_doctype_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_doctype_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_doctype_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_doctype_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_doctype_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_doctype_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_doctype_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_font_20.html b/components/net/tests/parsable_mime/text/html/text_html_font_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_font_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_font_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_font_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_font_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_font_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_font_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_font_3e.html b/components/net/tests/parsable_mime/text/html/text_html_font_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_font_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_font_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_font_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_font_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_font_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_font_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_h1_20.html b/components/net/tests/parsable_mime/text/html/text_html_h1_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_h1_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_h1_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_h1_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_h1_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_h1_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_h1_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_h1_3e.html b/components/net/tests/parsable_mime/text/html/text_html_h1_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_h1_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_h1_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_h1_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_h1_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_h1_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_h1_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_head_20.html b/components/net/tests/parsable_mime/text/html/text_html_head_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_head_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_head_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_head_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_head_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_head_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_head_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_head_3e.html b/components/net/tests/parsable_mime/text/html/text_html_head_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_head_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_head_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_head_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_head_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_head_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_head_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_iframe_20.html b/components/net/tests/parsable_mime/text/html/text_html_iframe_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_iframe_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_iframe_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_iframe_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_iframe_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_iframe_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_iframe_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_iframe_3e.html b/components/net/tests/parsable_mime/text/html/text_html_iframe_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_iframe_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_iframe_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_iframe_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_iframe_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_iframe_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_iframe_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_p_20.html b/components/net/tests/parsable_mime/text/html/text_html_p_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_p_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_p_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_p_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_p_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_p_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_p_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_p_3e.html b/components/net/tests/parsable_mime/text/html/text_html_p_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_p_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_p_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_p_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_p_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_p_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_p_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_page_20.html b/components/net/tests/parsable_mime/text/html/text_html_page_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_page_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_page_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_page_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_page_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_page_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_page_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_page_3e.html b/components/net/tests/parsable_mime/text/html/text_html_page_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_page_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_page_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_page_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_page_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_page_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_page_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_script_20.html b/components/net/tests/parsable_mime/text/html/text_html_script_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_script_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_script_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_script_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_script_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_script_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_script_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_script_3e.html b/components/net/tests/parsable_mime/text/html/text_html_script_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_script_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_script_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_script_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_script_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_script_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_script_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_style_20.html b/components/net/tests/parsable_mime/text/html/text_html_style_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_style_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_style_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_style_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_style_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_style_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_style_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_style_3e.html b/components/net/tests/parsable_mime/text/html/text_html_style_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_style_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_style_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_style_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_style_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_style_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_style_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_table_20.html b/components/net/tests/parsable_mime/text/html/text_html_table_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_table_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_table_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_table_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_table_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_table_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_table_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_table_3e.html b/components/net/tests/parsable_mime/text/html/text_html_table_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_table_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_table_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_table_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_table_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_table_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_table_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_title_20.html b/components/net/tests/parsable_mime/text/html/text_html_title_20.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_title_20.html
rename to components/net/tests/parsable_mime/text/html/text_html_title_20.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_title_20_u.html b/components/net/tests/parsable_mime/text/html/text_html_title_20_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_title_20_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_title_20_u.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_title_3e.html b/components/net/tests/parsable_mime/text/html/text_html_title_3e.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_title_3e.html
rename to components/net/tests/parsable_mime/text/html/text_html_title_3e.html
diff --git a/tests/unit/net/parsable_mime/text/html/text_html_title_3e_u.html b/components/net/tests/parsable_mime/text/html/text_html_title_3e_u.html
similarity index 100%
rename from tests/unit/net/parsable_mime/text/html/text_html_title_3e_u.html
rename to components/net/tests/parsable_mime/text/html/text_html_title_3e_u.html
diff --git a/tests/unit/net/parsable_mime/text/plain/utf16bebom.txt b/components/net/tests/parsable_mime/text/plain/utf16bebom.txt
similarity index 100%
rename from tests/unit/net/parsable_mime/text/plain/utf16bebom.txt
rename to components/net/tests/parsable_mime/text/plain/utf16bebom.txt
diff --git a/tests/unit/net/parsable_mime/text/plain/utf16lebom.txt b/components/net/tests/parsable_mime/text/plain/utf16lebom.txt
similarity index 100%
rename from tests/unit/net/parsable_mime/text/plain/utf16lebom.txt
rename to components/net/tests/parsable_mime/text/plain/utf16lebom.txt
diff --git a/tests/unit/net/parsable_mime/text/plain/utf8bom.txt b/components/net/tests/parsable_mime/text/plain/utf8bom.txt
similarity index 100%
rename from tests/unit/net/parsable_mime/text/plain/utf8bom.txt
rename to components/net/tests/parsable_mime/text/plain/utf8bom.txt
diff --git a/tests/unit/net/parsable_mime/text/xml/feed.atom b/components/net/tests/parsable_mime/text/xml/feed.atom
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/feed.atom
rename to components/net/tests/parsable_mime/text/xml/feed.atom
diff --git a/tests/unit/net/parsable_mime/text/xml/feed.rss b/components/net/tests/parsable_mime/text/xml/feed.rss
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/feed.rss
rename to components/net/tests/parsable_mime/text/xml/feed.rss
diff --git a/tests/unit/net/parsable_mime/text/xml/rdf_rss.xml b/components/net/tests/parsable_mime/text/xml/rdf_rss.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/rdf_rss.xml
rename to components/net/tests/parsable_mime/text/xml/rdf_rss.xml
diff --git a/tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_1.xml b/components/net/tests/parsable_mime/text/xml/rdf_rss_ko_1.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_1.xml
rename to components/net/tests/parsable_mime/text/xml/rdf_rss_ko_1.xml
diff --git a/tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_2.xml b/components/net/tests/parsable_mime/text/xml/rdf_rss_ko_2.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_2.xml
rename to components/net/tests/parsable_mime/text/xml/rdf_rss_ko_2.xml
diff --git a/tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_3.xml b/components/net/tests/parsable_mime/text/xml/rdf_rss_ko_3.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_3.xml
rename to components/net/tests/parsable_mime/text/xml/rdf_rss_ko_3.xml
diff --git a/tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_4.xml b/components/net/tests/parsable_mime/text/xml/rdf_rss_ko_4.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/rdf_rss_ko_4.xml
rename to components/net/tests/parsable_mime/text/xml/rdf_rss_ko_4.xml
diff --git a/tests/unit/net/parsable_mime/text/xml/test.xml b/components/net/tests/parsable_mime/text/xml/test.xml
similarity index 100%
rename from tests/unit/net/parsable_mime/text/xml/test.xml
rename to components/net/tests/parsable_mime/text/xml/test.xml
diff --git a/tests/unit/net/parsable_mime/unknown/binary_file b/components/net/tests/parsable_mime/unknown/binary_file
similarity index 100%
rename from tests/unit/net/parsable_mime/unknown/binary_file
rename to components/net/tests/parsable_mime/unknown/binary_file
diff --git a/tests/unit/net/parsable_mime/unknown/open_type b/components/net/tests/parsable_mime/unknown/open_type
similarity index 100%
rename from tests/unit/net/parsable_mime/unknown/open_type
rename to components/net/tests/parsable_mime/unknown/open_type
diff --git a/tests/unit/net/parsable_mime/unknown/true_type.ttf b/components/net/tests/parsable_mime/unknown/true_type.ttf
similarity index 100%
rename from tests/unit/net/parsable_mime/unknown/true_type.ttf
rename to components/net/tests/parsable_mime/unknown/true_type.ttf
diff --git a/tests/unit/net/parsable_mime/unknown/true_type_collection.ttc b/components/net/tests/parsable_mime/unknown/true_type_collection.ttc
similarity index 100%
rename from tests/unit/net/parsable_mime/unknown/true_type_collection.ttc
rename to components/net/tests/parsable_mime/unknown/true_type_collection.ttc
diff --git a/tests/unit/net/parsable_mime/video/avi/test.avi b/components/net/tests/parsable_mime/video/avi/test.avi
similarity index 100%
rename from tests/unit/net/parsable_mime/video/avi/test.avi
rename to components/net/tests/parsable_mime/video/avi/test.avi
diff --git a/tests/unit/net/parsable_mime/video/mp4/test.mp4 b/components/net/tests/parsable_mime/video/mp4/test.mp4
similarity index 100%
rename from tests/unit/net/parsable_mime/video/mp4/test.mp4
rename to components/net/tests/parsable_mime/video/mp4/test.mp4
diff --git a/tests/unit/net/parsable_mime/video/webm/test.webm b/components/net/tests/parsable_mime/video/webm/test.webm
similarity index 100%
rename from tests/unit/net/parsable_mime/video/webm/test.webm
rename to components/net/tests/parsable_mime/video/webm/test.webm
diff --git a/tests/unit/net/resource_thread.rs b/components/net/tests/resource_thread.rs
similarity index 100%
rename from tests/unit/net/resource_thread.rs
rename to components/net/tests/resource_thread.rs
diff --git a/tests/unit/net/subresource_integrity.rs b/components/net/tests/subresource_integrity.rs
similarity index 100%
rename from tests/unit/net/subresource_integrity.rs
rename to components/net/tests/subresource_integrity.rs
diff --git a/tests/unit/net/test.jpeg b/components/net/tests/test.jpeg
similarity index 100%
rename from tests/unit/net/test.jpeg
rename to components/net/tests/test.jpeg
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 56cf12124b0..907f6fa531b 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -231,7 +231,7 @@ class MachCommands(CommandBase):
             else:
                 test_patterns.append(test)
 
-        self_contained_tests = ["gfx", "layout", "msg", "selectors"]
+        self_contained_tests = ["gfx", "layout", "msg", "net", "selectors"]
         if not packages:
             packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
             packages |= set(self_contained_tests)
@@ -863,7 +863,7 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
     def update_net_cookies(self):
         cache_dir = path.join(self.config["tools"]["cache-dir"], "tests")
         run_file = path.abspath(path.join(PROJECT_TOPLEVEL_PATH,
-                                          "tests", "unit", "net",
+                                          "components", "net", "tests",
                                           "cookie_http_state_utils.py"))
         run_globals = {"__file__": run_file}
         execfile(run_file, run_globals)
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 2f668675af8..5fdd9692f8b 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -46,6 +46,7 @@ packages = [
 ]
 # Files that are ignored for all tidy and lint checks.
 files = [
+  "./components/net/tests/parsable_mime/text",
   # Mako does not lend itself easily to splitting long lines
   "./components/style/properties/helpers/animated_properties.mako.rs",
   # Helper macro where actually a pseudo-element per line makes sense.
@@ -63,7 +64,6 @@ files = [
   "./tests/wpt/mozilla/tests/webgl",
   # Ignore those files since the issues reported are on purpose
   "./tests/html/bad-line-ends.html",
-  "./tests/unit/net/parsable_mime/text",
   "./tests/wpt/mozilla/tests/css/fonts",
   "./tests/wpt/mozilla/tests/css/pre_with_tab.html",
   "./tests/wpt/mozilla/tests/mozilla/textarea_placeholder.html",
diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml
deleted file mode 100644
index d113e239d18..00000000000
--- a/tests/unit/net/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "net_tests"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-
-[lib]
-name = "net_tests"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-cookie = "0.10"
-devtools_traits = {path = "../../../components/devtools_traits"}
-flate2 = "0.2.0"
-hyper = "0.10"
-hyper-openssl = "0.2"
-hyper_serde = "0.8"
-ipc-channel = "0.9"
-msg = {path = "../../../components/msg"}
-net = {path = "../../../components/net"}
-net_traits = {path = "../../../components/net_traits"}
-profile_traits = {path = "../../../components/profile_traits"}
-servo_config = {path = "../../../components/config"}
-time = "0.1"
-unicase = "1.0"
-url = "1.2"
-servo_url = {path = "../../../components/url"}