diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs
index 27dd055cd3ae7..a0defbc09dc04 100644
--- a/src/libsyntax/parse/attr.rs
+++ b/src/libsyntax/parse/attr.rs
@@ -125,7 +125,7 @@ impl<'a> Parser<'a> {
 
                 self.expect(&token::OpenDelim(token::Bracket))?;
                 let meta_item = self.parse_meta_item()?;
-                let hi = self.span.hi;
+                let hi = self.last_span.hi;
                 self.expect(&token::CloseDelim(token::Bracket))?;
 
                 (mk_sp(lo, hi), meta_item, style)
@@ -231,12 +231,12 @@ impl<'a> Parser<'a> {
             token::Eq => {
                 self.bump();
                 let lit = self.parse_unsuffixed_lit()?;
-                let hi = self.span.hi;
+                let hi = self.last_span.hi;
                 Ok(P(spanned(lo, hi, ast::MetaItemKind::NameValue(name, lit))))
             }
             token::OpenDelim(token::Paren) => {
                 let inner_items = self.parse_meta_seq()?;
-                let hi = self.span.hi;
+                let hi = self.last_span.hi;
                 Ok(P(spanned(lo, hi, ast::MetaItemKind::List(name, inner_items))))
             }
             _ => {
@@ -253,14 +253,14 @@ impl<'a> Parser<'a> {
 
         match self.parse_unsuffixed_lit() {
             Ok(lit) => {
-                return Ok(spanned(lo, self.span.hi, ast::NestedMetaItemKind::Literal(lit)))
+                return Ok(spanned(lo, self.last_span.hi, ast::NestedMetaItemKind::Literal(lit)))
             }
             Err(ref mut err) => self.diagnostic().cancel(err)
         }
 
         match self.parse_meta_item() {
             Ok(mi) => {
-                return Ok(spanned(lo, self.span.hi, ast::NestedMetaItemKind::MetaItem(mi)))
+                return Ok(spanned(lo, self.last_span.hi, ast::NestedMetaItemKind::MetaItem(mi)))
             }
             Err(ref mut err) => self.diagnostic().cancel(err)
         }
diff --git a/src/test/compile-fail/E0535.rs b/src/test/ui/span/E0535.rs
similarity index 100%
rename from src/test/compile-fail/E0535.rs
rename to src/test/ui/span/E0535.rs
diff --git a/src/test/ui/span/E0535.stderr b/src/test/ui/span/E0535.stderr
new file mode 100644
index 0000000000000..23070e1555b9b
--- /dev/null
+++ b/src/test/ui/span/E0535.stderr
@@ -0,0 +1,8 @@
+error[E0535]: invalid argument
+  --> $DIR/E0535.rs:11:10
+   |
+11 | #[inline(unknown)] //~ ERROR E0535
+   |          ^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/compile-fail/E0536.rs b/src/test/ui/span/E0536.rs
similarity index 100%
rename from src/test/compile-fail/E0536.rs
rename to src/test/ui/span/E0536.rs
diff --git a/src/test/ui/span/E0536.stderr b/src/test/ui/span/E0536.stderr
new file mode 100644
index 0000000000000..c33b89953e274
--- /dev/null
+++ b/src/test/ui/span/E0536.stderr
@@ -0,0 +1,8 @@
+error[E0536]: expected 1 cfg-pattern
+  --> $DIR/E0536.rs:11:7
+   |
+11 | #[cfg(not())] //~ ERROR E0536
+   |       ^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/compile-fail/E0537.rs b/src/test/ui/span/E0537.rs
similarity index 100%
rename from src/test/compile-fail/E0537.rs
rename to src/test/ui/span/E0537.rs
diff --git a/src/test/ui/span/E0537.stderr b/src/test/ui/span/E0537.stderr
new file mode 100644
index 0000000000000..9d66ddbaae317
--- /dev/null
+++ b/src/test/ui/span/E0537.stderr
@@ -0,0 +1,8 @@
+error[E0537]: invalid predicate `unknown`
+  --> $DIR/E0537.rs:11:7
+   |
+11 | #[cfg(unknown())] //~ ERROR E0537
+   |       ^^^^^^^^^
+
+error: aborting due to previous error
+