diff --git a/gas/ChangeLog b/gas/ChangeLog
index e640fecd05..6e701292fa 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2021-02-12  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/gas/all/pr27381.err: Don't match source file name.
+	* testsuite/gas/all/pr27381.s: Don't start directive in first column.
+	* testsuite/gas/all/pr27384.err: Don't match source file name.
+	Adjust line number.
+	* testsuite/gas/all/pr27384.s: Add ".text" directive.
+	* testsuite/gas/elf/pr27355.err: Don't match source file name.
+
 2021-02-11  Alan Modra  <amodra@gmail.com>
 
 	* NEWS: Mention arm-symbianelf removal.
diff --git a/gas/testsuite/gas/all/pr27381.err b/gas/testsuite/gas/all/pr27381.err
index f414210c79..493180d59c 100644
--- a/gas/testsuite/gas/all/pr27381.err
+++ b/gas/testsuite/gas/all/pr27381.err
@@ -1,2 +1,2 @@
-.*pr27381.s: Assembler messages:
-.*pr27381.s:1: Error: unable to include `/etc/'
+.*: Assembler messages:
+.*:1: Error: unable to include `/etc/'
diff --git a/gas/testsuite/gas/all/pr27381.s b/gas/testsuite/gas/all/pr27381.s
index b75523fc6d..949b624d86 100644
--- a/gas/testsuite/gas/all/pr27381.s
+++ b/gas/testsuite/gas/all/pr27381.s
@@ -1 +1 @@
-.incbin "/etc/"
+ .incbin "/etc/"
diff --git a/gas/testsuite/gas/all/pr27384.err b/gas/testsuite/gas/all/pr27384.err
index 2d5954f91e..3eb1e5362a 100644
--- a/gas/testsuite/gas/all/pr27384.err
+++ b/gas/testsuite/gas/all/pr27384.err
@@ -1,4 +1,4 @@
-.*pr27384.s: Assembler messages:
-.*pr27384.s:2: Error: bad or irreducible absolute expression
-.*pr27384.s:2: Error: new paper width is too small
+.*: Assembler messages:
+.*:3: Error: bad or irreducible absolute expression
+.*:3: Error: new paper width is too small
 #pass
diff --git a/gas/testsuite/gas/all/pr27384.s b/gas/testsuite/gas/all/pr27384.s
index 6d831b0d5f..51274bdabe 100644
--- a/gas/testsuite/gas/all/pr27384.s
+++ b/gas/testsuite/gas/all/pr27384.s
@@ -1,4 +1,4 @@
+	.text
 	.nop
 	.Psize	f,-7
 	.nop
-	
diff --git a/gas/testsuite/gas/elf/pr27355.err b/gas/testsuite/gas/elf/pr27355.err
index 6f5e2eae17..fdbeb224f0 100644
--- a/gas/testsuite/gas/elf/pr27355.err
+++ b/gas/testsuite/gas/elf/pr27355.err
@@ -1,5 +1,5 @@
-.*pr27355.s: Assembler messages:
-.*pr27355.s:1: Error: bad expression
-.*pr27355.s:2: Error: bad or irreducible absolute expression
-.*pr27355.s:3: Error: bad or irreducible absolute expression
-.*pr27355.s:3: Error: missing string
+.*: Assembler messages:
+.*:1: Error: bad expression
+.*:2: Error: bad or irreducible absolute expression
+.*:3: Error: bad or irreducible absolute expression
+.*:3: Error: missing string