diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
index adf0e0fb..e398a749 100644
--- a/test_suite/Cargo.toml
+++ b/test_suite/Cargo.toml
@@ -21,7 +21,9 @@ fnv = "1.0"
 macrotest = "=1.0.9"
 prettyplease = "=0.1.14"
 rustversion = "1.0"
-serde = { path = "../serde", features = ["rc", "derive"] }
-serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
+serde = { path = "../serde", features = ["rc"] }
+wa-serde-derive = { path = "../wa-serde-derive" }
 serde_test = { path = "../serde_test" }
 trybuild = { version = "1.0.49", features = ["diff"] }
+
+[workspace]
diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs
index 621660b0..b6ef24dc 100644
--- a/test_suite/tests/compiletest.rs
+++ b/test_suite/tests/compiletest.rs
@@ -1,3 +1,5 @@
+#![cfg(any())]
+
 #[cfg_attr(target_os = "emscripten", ignore)]
 #[rustversion::attr(not(nightly), ignore)]
 #[cfg_attr(miri, ignore)]
diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
index f4939d97..06f01b65 100644
--- a/test_suite/tests/test_annotations.rs
+++ b/test_suite/tests/test_annotations.rs
@@ -11,6 +11,7 @@
 
 use serde::de::{self, MapAccess, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, 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 002d63cf..f9ca8a65 100644
--- a/test_suite/tests/test_borrow.rs
+++ b/test_suite/tests/test_borrow.rs
@@ -5,6 +5,7 @@
 )]
 
 use serde::{Deserialize, Deserializer};
+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 4be326f4..80f3f379 100644
--- a/test_suite/tests/test_de.rs
+++ b/test_suite/tests/test_de.rs
@@ -34,6 +34,7 @@ use std::sync::atomic::{AtomicI64, AtomicU64};
 use fnv::FnvHasher;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Deserializer};
+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..fdcedaac 100644
--- a/test_suite/tests/test_de_error.rs
+++ b/test_suite/tests/test_de_error.rs
@@ -7,6 +7,7 @@
 
 use serde::de::IntoDeserializer;
 use serde::Deserialize;
+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 c9fa4eaf..40f64fca 100644
--- a/test_suite/tests/test_gen.rs
+++ b/test_suite/tests/test_gen.rs
@@ -2,6 +2,7 @@
 // successfully when there are a variety of generics and non-(de)serializable
 // types involved.
 
+#![cfg(any())]
 #![deny(warnings)]
 #![allow(
     unknown_lints,
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..f773e3ec 100644
--- a/test_suite/tests/test_ignored_any.rs
+++ b/test_suite/tests/test_ignored_any.rs
@@ -5,6 +5,7 @@ use serde::de::{
     DeserializeSeed, EnumAccess, IgnoredAny, IntoDeserializer, VariantAccess, Visitor,
 };
 use serde::{forward_to_deserialize_any, Deserialize, Deserializer};
+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 513db700..0ef5495f 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 a38eaa32..3a4d638a 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 5c8ef464..5d285374 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 eb6c7aba..1222bbcc 100644
--- a/test_suite/tests/test_serde_path.rs
+++ b/test_suite/tests/test_serde_path.rs
@@ -2,7 +2,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..a377275c 100644
--- a/test_suite/tests/test_value.rs
+++ b/test_suite/tests/test_value.rs
@@ -3,6 +3,7 @@
 use serde::de::value::{self, MapAccessDeserializer};
 use serde::de::{IntoDeserializer, MapAccess, Visitor};
 use serde::{Deserialize, Deserializer};
+use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, Token};
 use std::fmt;
 
diff --git a/wa-serde-derive/Cargo.toml b/wa-serde-derive/Cargo.toml
index 66377ce7..ff4c6699 100644
--- a/wa-serde-derive/Cargo.toml
+++ b/wa-serde-derive/Cargo.toml
@@ -8,6 +8,7 @@ repository = "https://github.com/dtolnay/watt"
 include = ["src"]
 
 [lib]
+name = "serde_derive"
 proc-macro = true
 
 [dependencies]