diff --git a/src/test/compile-fail/aggregate-rvalues-typeck.rs b/src/test/compile-fail/aggregate-rvalues-typeck.rs
index 693d7f9821ad..99f3e461ec98 100644
--- a/src/test/compile-fail/aggregate-rvalues-typeck.rs
+++ b/src/test/compile-fail/aggregate-rvalues-typeck.rs
@@ -7,16 +7,22 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-//compile-flags: -Z emit-end-regions -Z borrowck-mir -Z mir
+//revisions: ast mir
+//[mir] compile-flags: -Z emit-end-regions -Z borrowck-mir -Z nll
 
 #![allow(unused_assignments)]
 
 struct Wrap<'a> { w: &'a mut u32 }
 
 fn foo() {
-    let mut x = 22u64;
+    let mut x = 22;
     let wrapper = Wrap { w: &mut x };
-    x += 1;  //~ ERROR cannot assign to `x`
+    //~^ ERROR cannot assign to `x` because it is borrowed (Mir) [E0506]
+    //~^^ ERROR cannot use `x` because it was mutably borrowed (Mir) [E0503]
+    x += 1; //[ast]~ ERROR cannot assign to `x` because it is borrowed [E0506]
+    //[mir]~^ ERROR cannot assign to `x` because it is borrowed (Ast) [E0506]
+    //[mir]~^^ ERROR cannot assign to `x` because it is borrowed (Mir) [E0506]
+    //[mir]~^^^ ERROR cannot use `x` because it was mutably borrowed (Mir) [E0503]
     *wrapper.w += 1;
 }