diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7a154558700..bb6beb8e3c3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-06  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/20896
+	* testsuite/gas/mmix/err-byte1.s: Adjust expected warning messages
+	to account for patch to next_char_of_string.
+
 2016-12-05  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/20902
diff --git a/gas/testsuite/gas/mmix/err-byte1.s b/gas/testsuite/gas/mmix/err-byte1.s
index eefded3e431..e63be959d62 100644
--- a/gas/testsuite/gas/mmix/err-byte1.s
+++ b/gas/testsuite/gas/mmix/err-byte1.s
@@ -1,6 +1,7 @@
 % { dg-do assemble { target mmix-*-* } }
-% { dg-error "unterminated string|missing closing" "" { target mmix-*-* } 10 }
-% { dg-bogus "end of file" "" { xfail mmix-*-* } 0 }
+% { dg-error "unterminated string|missing closing" "" { target mmix-*-* } 11 }
+% { dg-error "unterminated string|missing closing" "" { target mmix-*-* } 13 }
+% { dg-warning "end of file" "" { target mmix-*-* } 0 }
 
 # Note that the error is detected in the preformatter, before the text
 # gets to the assembler.  It also gets confused about the unterminated