diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
index 2f904a1f..c55a7140 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename="x", serialize="y")] //~^^ HELP: unknown serde field attribute `serialize`
     x: (),
diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
index bd7be3ad..92b02a8d 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename="x")]
     #[serde(rename(deserialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`
diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
index 6ca7c8f8..3f3ead14 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"), rename(serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
     x: (),
diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
index afe343b1..5f160c40 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"))]
     #[serde(rename="y")] //~^^^ HELP: duplicate serde attribute `rename`
diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
index 8d50c256..7792bf6a 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x", serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
     x: (),
diff --git a/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
index 94b67cff..31d903ee 100644
--- a/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
+++ b/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"))]
     #[serde(rename(serialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`
diff --git a/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs b/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs
index 950e8d02..c399ab07 100644
--- a/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs
+++ b/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] cannot be used with tuple variants
 enum E {
     Tuple(u8, u8),
diff --git a/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs b/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs
index 358dfde4..bd4fe2ea 100644
--- a/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs
+++ b/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] can only be used on enums
 struct S;
 
diff --git a/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs b/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs
index 7442679c..71104ff6 100644
--- a/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs
+++ b/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(untagged)]
 #[serde(tag = "type")] //~^^ HELP: enum cannot be both untagged and internally tagged
 enum E {
diff --git a/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs b/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs
index 611f8416..0bf6dd13 100644
--- a/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs
+++ b/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(untagged)] //~^ HELP: #[serde(untagged)] can only be used on enums
 struct S;
 
diff --git a/test_suite/tests/compile-fail/str_ref_deser.rs b/test_suite/tests/compile-fail/str_ref_deser.rs
index 08c9b1f9..51f03f5c 100644
--- a/test_suite/tests/compile-fail/str_ref_deser.rs
+++ b/test_suite/tests/compile-fail/str_ref_deser.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize, Deserialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize, Deserialize)] //~ ERROR: proc-macro derive panicked
 struct Test<'a> {
     s: &'a str, //~^^ HELP: Serde does not support deserializing fields of type &str
 }
diff --git a/test_suite/tests/compile-fail/unknown-attribute/container.rs b/test_suite/tests/compile-fail/unknown-attribute/container.rs
index 59abfe1d..9bf97a19 100644
--- a/test_suite/tests/compile-fail/unknown-attribute/container.rs
+++ b/test_suite/tests/compile-fail/unknown-attribute/container.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(abc="xyz")] //~^ HELP: unknown serde container attribute `abc`
 struct A {
     x: u32,
diff --git a/test_suite/tests/compile-fail/unknown-attribute/field.rs b/test_suite/tests/compile-fail/unknown-attribute/field.rs
index 66142ce3..82915b21 100644
--- a/test_suite/tests/compile-fail/unknown-attribute/field.rs
+++ b/test_suite/tests/compile-fail/unknown-attribute/field.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct C {
     #[serde(abc="xyz")] //~^^ HELP: unknown serde field attribute `abc`
     x: u32,
diff --git a/test_suite/tests/compile-fail/unknown-attribute/variant.rs b/test_suite/tests/compile-fail/unknown-attribute/variant.rs
index 9b95ec0a..de3ec976 100644
--- a/test_suite/tests/compile-fail/unknown-attribute/variant.rs
+++ b/test_suite/tests/compile-fail/unknown-attribute/variant.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 enum E {
     #[serde(abc="xyz")] //~^^ HELP: unknown serde variant attribute `abc`
     V,