diff --git a/src/data_forms.rs b/src/data_forms.rs
index 9905f4b400ba4e0d6f33f36afdaee5a90cd07d76..b5cd004b6e691e07c5670576ebbca3b420e5e736 100644
--- a/src/data_forms.rs
+++ b/src/data_forms.rs
@@ -86,7 +86,7 @@ impl IntoElements for Field {
     }
 }
 
-generate_attribute!(Subscription, "subscription", {
+generate_attribute!(DataFormType, "type", {
     Cancel => "cancel",
     Form => "form",
     Result_ => "result",
@@ -272,7 +272,7 @@ mod tests {
             Error::ParseError(string) => string,
             _ => panic!(),
         };
-        assert_eq!(message, "Unknown data form type.");
+        assert_eq!(message, "Unknown value for 'type' attribute.");
     }
 
     #[test]
diff --git a/src/ibb.rs b/src/ibb.rs
index 5463caae809975377e084151a4ac661a63f1a8ba..ad9873778afcfc4cb362fecb38fdd59ab0e9991d 100644
--- a/src/ibb.rs
+++ b/src/ibb.rs
@@ -181,6 +181,6 @@ mod tests {
             Error::ParseError(string) => string,
             _ => panic!(),
         };
-        assert_eq!(message, "Invalid 'stanza' attribute.");
+        assert_eq!(message, "Unknown value for 'stanza' attribute.");
     }
 }
diff --git a/src/jingle_ibb.rs b/src/jingle_ibb.rs
index afbf11c3308167ea02b4f0d8e589517434654894..25dbaa377ce1eb3966725a053479cbb3cc568eac 100644
--- a/src/jingle_ibb.rs
+++ b/src/jingle_ibb.rs
@@ -107,6 +107,6 @@ mod tests {
             Error::ParseError(string) => string,
             _ => panic!(),
         };
-        assert_eq!(message, "Invalid 'stanza' attribute.");
+        assert_eq!(message, "Unknown value for 'stanza' attribute.");
     }
 }
diff --git a/src/message.rs b/src/message.rs
index 79038c1249b92736fee62a21123a732eb2b98a36..8025a2a12ffca4d3085f7f01ea22bb21ffc7dad0 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -236,7 +236,7 @@ mod tests {
 
     #[test]
     fn test_serialise() {
-        let elem: Element = "<message xmlns='jabber:client' type='normal'/>".parse().unwrap();
+        let elem: Element = "<message xmlns='jabber:client'/>".parse().unwrap();
         let message = Message {
             from: None,
             to: None,