diff --git a/martian-derive/tests/ui_martian_struct/test_invalid_mro_type_val.stderr b/martian-derive/tests/ui_martian_struct/test_invalid_mro_type_val.stderr
index 33387fbf58..9fc3cb18d9 100644
--- a/martian-derive/tests/ui_martian_struct/test_invalid_mro_type_val.stderr
+++ b/martian-derive/tests/ui_martian_struct/test_invalid_mro_type_val.stderr
@@ -1,20 +1,12 @@
+error: "The usage of mro_type should be of form #[mro_type="type"] or #[mro_type="type[]"], where type can be one of: int, float, string, bool, map, path"
+ --> tests/ui_martian_struct/test_invalid_mro_type_val.rs:8:5
+  |
+8 | /     #[mro_type=int] // Should be "int"
+9 | |     foo: Foo,
+  | |____________^
+
 error: unexpected expression: `int`
- --> $DIR/test_invalid_mro_type_val.rs:8:16
+ --> tests/ui_martian_struct/test_invalid_mro_type_val.rs:8:16
   |
 8 |     #[mro_type=int] // Should be "int"
   |                ^^^
-
-error[E0277]: the trait bound `Foo: MartianFileType` is not satisfied
- --> $DIR/test_invalid_mro_type_val.rs:5:10
-  |
-5 | #[derive(MartianStruct)]
-  |          ^^^^^^^^^^^^^ the trait `MartianFileType` is not implemented for `Foo`
-  |
-  = help: the following other types implement trait `AsMartianBlanketType`:
-            HashMap<K, V, H>
-            HashSet<K, H>
-            Option<T>
-            Vec<T>
-  = note: required for `Foo` to implement `AsMartianPrimaryType`
-  = note: required for `Foo` to implement `AsMartianBlanketType`
-  = note: this error originates in the derive macro `MartianStruct` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/martian-derive/tests/ui_martian_struct/test_missing_martian_type.stderr b/martian-derive/tests/ui_martian_struct/test_missing_martian_type.stderr
index c49ea3430b..94d6ba6a08 100644
--- a/martian-derive/tests/ui_martian_struct/test_missing_martian_type.stderr
+++ b/martian-derive/tests/ui_martian_struct/test_missing_martian_type.stderr
@@ -7,8 +7,8 @@ error[E0277]: the trait bound `Foo: MartianFileType` is not satisfied
   = help: the following other types implement trait `AsMartianBlanketType`:
             HashMap<K, V, H>
             HashSet<K, H>
-            Option<T>
             Vec<T>
+            Option<T>
   = note: required for `Foo` to implement `AsMartianPrimaryType`
   = note: required for `Foo` to implement `AsMartianBlanketType`
   = note: this error originates in the derive macro `MartianStruct` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/martian-derive/tests/ui_martian_struct/test_multiple_mro_type.stderr b/martian-derive/tests/ui_martian_struct/test_multiple_mro_type.stderr
index 8d618dbd54..141ef0cb10 100644
--- a/martian-derive/tests/ui_martian_struct/test_multiple_mro_type.stderr
+++ b/martian-derive/tests/ui_martian_struct/test_multiple_mro_type.stderr
@@ -1,5 +1,5 @@
-error: Looks like you are setting #[mro_type] twice for field 'foo'
-  --> $DIR/test_multiple_mro_type.rs:8:5
+error: Specified #[mro_type] twice for field 'foo'
+  --> tests/ui_martian_struct/test_multiple_mro_type.rs:8:5
    |
 8  | /     #[mro_type = "int"]
 9  | |     #[mro_type = "float"] // Cannot specify twice