diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
index 0213f33a..a168e234 100644
--- a/test_suite/Cargo.toml
+++ b/test_suite/Cargo.toml
@@ -15,7 +15,7 @@ serde = { path = "../serde" }
 automod = "1.0.1"
 fnv = "1.0"
 rustversion = "1.0"
-serde = { path = "../serde", features = ["rc", "derive"] }
+serde = { path = "../serde", features = ["rc"] }
 serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
 serde_test = { path = "../serde_test" }
 trybuild = { version = "1.0.66", features = ["diff"] }
diff --git a/test_suite/no_std/Cargo.toml b/test_suite/no_std/Cargo.toml
index 1ba3c9a2..5bf7eb2d 100644
--- a/test_suite/no_std/Cargo.toml
+++ b/test_suite/no_std/Cargo.toml
@@ -7,6 +7,7 @@ publish = false
 
 [dependencies]
 libc = { version = "0.2", default-features = false }
-serde = { path = "../../serde", default-features = false, features = ["derive"] }
+serde = { path = "../../serde", default-features = false }
+serde_derive = { path = "../../serde_derive" }
 
 [workspace]
diff --git a/test_suite/no_std/src/main.rs b/test_suite/no_std/src/main.rs
index 40f05a4d..666a1408 100644
--- a/test_suite/no_std/src/main.rs
+++ b/test_suite/no_std/src/main.rs
@@ -19,7 +19,7 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
 
 //////////////////////////////////////////////////////////////////////////////
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
 struct Unit;
diff --git a/test_suite/tests/regression/issue2371.rs b/test_suite/tests/regression/issue2371.rs
index 5388b595..e4832af3 100644
--- a/test_suite/tests/regression/issue2371.rs
+++ b/test_suite/tests/regression/issue2371.rs
@@ -1,4 +1,4 @@
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
 pub struct Nested;
diff --git a/test_suite/tests/regression/issue2409.rs b/test_suite/tests/regression/issue2409.rs
index 2e393669..cdfe4dc5 100644
--- a/test_suite/tests/regression/issue2409.rs
+++ b/test_suite/tests/regression/issue2409.rs
@@ -1,4 +1,4 @@
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 macro_rules! bug {
     ($serde_path:literal) => {
diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
index 82a98c36..33670930 100644
--- a/test_suite/tests/test_annotations.rs
+++ b/test_suite/tests/test_annotations.rs
@@ -10,8 +10,9 @@
     clippy::uninlined_format_args,
 )]
 
-use serde::de::{self, IgnoredAny, MapAccess, Unexpected, Visitor};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::de::{self, Deserialize, Deserializer, IgnoredAny, MapAccess, Unexpected, Visitor};
+use serde::ser::{Serialize, Serializer};
+use serde_derive::{Deserialize, Serialize};
 
 use std::collections::{BTreeMap, HashMap};
 use std::convert::TryFrom;
diff --git a/test_suite/tests/test_borrow.rs b/test_suite/tests/test_borrow.rs
index 654d1554..ded66ef6 100644
--- a/test_suite/tests/test_borrow.rs
+++ b/test_suite/tests/test_borrow.rs
@@ -5,8 +5,8 @@
 )]
 
 use serde::de::value::{BorrowedStrDeserializer, MapDeserializer};
-use serde::de::IntoDeserializer;
-use serde::{Deserialize, Deserializer};
+use serde::de::{Deserialize, Deserializer, IntoDeserializer};
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, assert_de_tokens_error, Token};
 
 use std::borrow::Cow;
diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs
index e47b1c02..422d699f 100644
--- a/test_suite/tests/test_de.rs
+++ b/test_suite/tests/test_de.rs
@@ -34,8 +34,8 @@ use std::time::{Duration, UNIX_EPOCH};
 use std::sync::atomic::{AtomicI64, AtomicU64};
 
 use fnv::FnvHasher;
-use serde::de::{DeserializeOwned, IntoDeserializer};
-use serde::{Deserialize, Deserializer};
+use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, Configure, Token};
 
 #[macro_use]
diff --git a/test_suite/tests/test_de_error.rs b/test_suite/tests/test_de_error.rs
index 18b59964..d4449fdd 100644
--- a/test_suite/tests/test_de_error.rs
+++ b/test_suite/tests/test_de_error.rs
@@ -5,8 +5,8 @@
 )]
 #![cfg_attr(feature = "unstable", feature(never_type))]
 
-use serde::de::IntoDeserializer;
-use serde::Deserialize;
+use serde::de::{Deserialize, IntoDeserializer};
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens_error, Token};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::ffi::{CStr, CString};
diff --git a/test_suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs
index de0ad900..a1f3ce6c 100644
--- a/test_suite/tests/test_gen.rs
+++ b/test_suite/tests/test_gen.rs
@@ -20,8 +20,9 @@
     clippy::type_repetition_in_bounds
 )]
 
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::de::{Deserialize, DeserializeOwned, Deserializer};
+use serde::ser::{Serialize, Serializer};
+use serde_derive::{Deserialize, Serialize};
 
 use std::borrow::Cow;
 use std::marker::PhantomData;
@@ -404,7 +405,7 @@ fn test_gen() {
     }
 
     mod vis {
-        use serde::{Deserialize, Serialize};
+        use serde_derive::{Deserialize, Serialize};
 
         pub struct S;
 
@@ -636,7 +637,7 @@ fn test_gen() {
 
     mod restricted {
         mod inner {
-            use serde::{Deserialize, Serialize};
+            use serde_derive::{Deserialize, Serialize};
 
             #[derive(Serialize, Deserialize)]
             struct Restricted {
diff --git a/test_suite/tests/test_identifier.rs b/test_suite/tests/test_identifier.rs
index 14b83b5c..6edb316c 100644
--- a/test_suite/tests/test_identifier.rs
+++ b/test_suite/tests/test_identifier.rs
@@ -2,7 +2,7 @@
 
 #![allow(clippy::derive_partial_eq_without_eq)]
 
-use serde::Deserialize;
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, Token};
 
 #[test]
diff --git a/test_suite/tests/test_ignored_any.rs b/test_suite/tests/test_ignored_any.rs
index ef4ebf2c..955b7974 100644
--- a/test_suite/tests/test_ignored_any.rs
+++ b/test_suite/tests/test_ignored_any.rs
@@ -2,9 +2,11 @@
 
 use serde::de::value::{Error, MapDeserializer, SeqDeserializer};
 use serde::de::{
-    DeserializeSeed, EnumAccess, IgnoredAny, IntoDeserializer, VariantAccess, Visitor,
+    Deserialize, DeserializeSeed, Deserializer, EnumAccess, IgnoredAny, IntoDeserializer,
+    VariantAccess, Visitor,
 };
-use serde::{forward_to_deserialize_any, Deserialize, Deserializer};
+use serde::forward_to_deserialize_any;
+use serde_derive::Deserialize;
 
 #[derive(PartialEq, Debug, Deserialize)]
 enum Target {
diff --git a/test_suite/tests/test_macros.rs b/test_suite/tests/test_macros.rs
index 0594d8d4..c1c730e9 100644
--- a/test_suite/tests/test_macros.rs
+++ b/test_suite/tests/test_macros.rs
@@ -8,7 +8,7 @@
 
 mod bytes;
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use serde_test::{
     assert_de_tokens, assert_de_tokens_error, assert_ser_tokens, assert_tokens, Token,
 };
diff --git a/test_suite/tests/test_remote.rs b/test_suite/tests/test_remote.rs
index d997f0f0..2a37909f 100644
--- a/test_suite/tests/test_remote.rs
+++ b/test_suite/tests/test_remote.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::redundant_field_names)]
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 mod remote {
     pub struct Unit;
diff --git a/test_suite/tests/test_self.rs b/test_suite/tests/test_self.rs
index 77fc9a20..516bdeae 100644
--- a/test_suite/tests/test_self.rs
+++ b/test_suite/tests/test_self.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::used_underscore_binding)]
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 
 #[test]
 fn test_self() {
diff --git a/test_suite/tests/test_ser.rs b/test_suite/tests/test_ser.rs
index ecaf125e..aa62699b 100644
--- a/test_suite/tests/test_ser.rs
+++ b/test_suite/tests/test_ser.rs
@@ -22,7 +22,7 @@ use std::str;
 use std::sync::atomic::{AtomicI64, AtomicU64};
 
 use fnv::FnvHasher;
-use serde::Serialize;
+use serde_derive::Serialize;
 use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
 
 #[macro_use]
diff --git a/test_suite/tests/test_serde_path.rs b/test_suite/tests/test_serde_path.rs
index d0e04e11..a87e49d9 100644
--- a/test_suite/tests/test_serde_path.rs
+++ b/test_suite/tests/test_serde_path.rs
@@ -5,7 +5,7 @@
 
 #[test]
 fn test_gen_custom_serde() {
-    #[derive(serde::Serialize, serde::Deserialize)]
+    #[derive(serde_derive::Serialize, serde_derive::Deserialize)]
     #[serde(crate = "fake_serde")]
     struct Foo;
 
diff --git a/test_suite/tests/test_value.rs b/test_suite/tests/test_value.rs
index 9aa666f3..15d25401 100644
--- a/test_suite/tests/test_value.rs
+++ b/test_suite/tests/test_value.rs
@@ -1,8 +1,8 @@
 #![allow(clippy::derive_partial_eq_without_eq, clippy::similar_names)]
 
 use serde::de::value::{self, MapAccessDeserializer};
-use serde::de::{IntoDeserializer, MapAccess, Visitor};
-use serde::{Deserialize, Deserializer};
+use serde::de::{Deserialize, Deserializer, IntoDeserializer, MapAccess, Visitor};
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, Token};
 use std::fmt;
 
diff --git a/test_suite/tests/ui/malformed/str_suffix.rs b/test_suite/tests/ui/malformed/str_suffix.rs
index 836842ee..20f13dfc 100644
--- a/test_suite/tests/ui/malformed/str_suffix.rs
+++ b/test_suite/tests/ui/malformed/str_suffix.rs
@@ -1,4 +1,4 @@
-use serde::Serialize;
+use serde_derive::Serialize;
 
 #[derive(Serialize)]
 #[serde(bound = ""huh)]
diff --git a/test_suite/tests/unstable/mod.rs b/test_suite/tests/unstable/mod.rs
index b0c221e6..8060b2ad 100644
--- a/test_suite/tests/unstable/mod.rs
+++ b/test_suite/tests/unstable/mod.rs
@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use serde_test::{assert_tokens, Token};
 
 #[test]