diff --git a/Cargo.lock b/Cargo.lock
index 3f7834fc5ff4..acf8dfff8ce3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1050,7 +1050,6 @@ dependencies = [
  "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
- "stylo_tests 0.0.1",
 ]
 
 [[package]]
@@ -2807,24 +2806,10 @@ dependencies = [
  "android_injected_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
- "deny_public_fields_tests 0.0.1",
- "gfx_tests 0.0.1",
  "glutin_app 0.0.1",
- "layout_tests 0.0.1",
  "libservo 0.0.1",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "malloc_size_of_tests 0.0.1",
- "metrics_tests 0.0.1",
- "msg_tests 0.0.1",
- "net_tests 0.0.1",
- "net_traits_tests 0.0.1",
- "profile_tests 0.0.1",
- "script_plugins_tests 0.0.1",
- "script_tests 0.0.1",
- "servo_config_tests 0.0.1",
- "servo_remutex_tests 0.0.1",
  "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "style_tests 0.0.1",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4dc921c54e6d..7c32ef6cf8ec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,12 @@
 [workspace]
 members = [
-    "ports/cef",
-    "ports/geckolib",
     "ports/servo",
+    "tests/unit/*",
+
+    "ports/geckolib",
+    "ports/geckolib/tests",
+
+    "ports/cef",
 ]
 exclude = [".cargo"]
 
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 5f370937b687..9fbe688571ab 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -31,6 +31,3 @@ servo_arc = {path = "../../components/servo_arc"}
 smallvec = "0.6"
 style = {path = "../../components/style", features = ["gecko"]}
 style_traits = {path = "../../components/style_traits"}
-
-[dev-dependencies]
-stylo_tests = {path = "./tests"}
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
index 489b6f63515f..e872da5fe118 100644
--- a/ports/servo/Cargo.toml
+++ b/ports/servo/Cargo.toml
@@ -13,22 +13,6 @@ path = "main.rs"
 test = false
 bench = false
 
-[dev-dependencies]
-deny_public_fields_tests = {path = "../../tests/unit/deny_public_fields"}
-gfx_tests = {path = "../../tests/unit/gfx"}
-layout_tests = {path = "../../tests/unit/layout"}
-malloc_size_of_tests = {path = "../../tests/unit/malloc_size_of"}
-metrics_tests = {path = "../../tests/unit/metrics"}
-msg_tests = {path = "../../tests/unit/msg"}
-net_tests = {path = "../../tests/unit/net"}
-net_traits_tests = {path = "../../tests/unit/net_traits"}
-profile_tests = {path = "../../tests/unit/profile"}
-script_tests = {path = "../../tests/unit/script"}
-script_plugins_tests = {path = "../../tests/unit/script_plugins"}
-servo_config_tests = {path = "../../tests/unit/servo_config"}
-servo_remutex_tests = {path = "../../tests/unit/servo_remutex"}
-style_tests = {path = "../../tests/unit/style"}
-
 [features]
 default = ["unstable", "default-except-unstable"]
 default-except-unstable = ["webdriver", "max_log_level"]
@@ -38,7 +22,7 @@ energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
 googlevr = ["libservo/googlevr"]
 oculusvr = ["libservo/oculusvr"]
-unstable = ["libservo/unstable", "profile_tests/unstable"]
+unstable = ["libservo/unstable"]
 
 [dependencies]
 backtrace = "0.3"
diff --git a/tests/unit/profile/Cargo.toml b/tests/unit/profile/Cargo.toml
index 0d04fba813f2..026593d80fa7 100644
--- a/tests/unit/profile/Cargo.toml
+++ b/tests/unit/profile/Cargo.toml
@@ -9,9 +9,6 @@ name = "profile_tests"
 path = "lib.rs"
 doctest = false
 
-[features]
-unstable = ["servo_allocator/unstable"]
-
 [dependencies]
 ipc-channel = "0.9"
 profile = {path = "../../../components/profile"}