diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 1fbc632f8e57..227db93cf656 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1341,8 +1341,8 @@ impl<'a> State<'a> {
             ast::ItemKind::Trait(is_auto, unsafety, ref generics, ref bounds, ref trait_items) => {
                 self.head("")?;
                 self.print_visibility(&item.vis)?;
-                self.print_is_auto(is_auto)?;
                 self.print_unsafety(unsafety)?;
+                self.print_is_auto(is_auto)?;
                 self.word_nbsp("trait")?;
                 self.print_ident(item.ident)?;
                 self.print_generics(generics)?;
diff --git a/src/test/pretty/auto-trait.rs b/src/test/pretty/auto-trait.rs
index 1f1a8a41a68a..842af49e8a7f 100644
--- a/src/test/pretty/auto-trait.rs
+++ b/src/test/pretty/auto-trait.rs
@@ -14,4 +14,6 @@
 
 auto trait MyTrait { }
 
+unsafe auto trait UnsafeMyTrait { }
+
 pub fn main() { }