diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4c1c3e2cd9..5152636ee9 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -8,6 +8,16 @@
 	New tests.
 	* gas/cris/brokw-2.s: Correct broken-word expansion visualization
 	in comment.
+	* gas/cris/fragtest.s, gas/cris/rd-pic-1.s,
+	gas/cris/binop-cmpmovx.d, gas/cris/binop-cmpmove.d,
+	gas/cris/binop.d, gas/cris/binop.s, gas/cris/brokw-2.d,
+	gas/cris/clear.d, gas/cris/fragtest.s, gas/cris/jump-type.d,
+	gas/cris/nosep.s, gas/cris/pushpop.d, gas/cris/quick.s,
+	gas/cris/range-err-2.s, gas/cris/sep-err-1.s,
+	gas/cris/sreg-to-x.d, gas/cris/test.d, gas/cris/x-to-byte-sreg.d,
+	gas/cris/x-to-word-sreg.d, gas/cris/x-to-dword-sreg.d: Remove
+	trailing empty lines.
+	* gas/cris/continue.s: Ditto, tweak comment.
 
 2001-04-05  Hans-Peter Nilsson  <hp@axis.com>
 
diff --git a/gas/testsuite/gas/cris/binop-cmpmove.d b/gas/testsuite/gas/cris/binop-cmpmove.d
index dec779c5dd..163743edcb 100644
--- a/gas/testsuite/gas/cris/binop-cmpmove.d
+++ b/gas/testsuite/gas/cris/binop-cmpmove.d
@@ -403,4 +403,3 @@ Disassembly of section \.text:
 [ 	]+76a:[ 	]+(R_CRIS_)?32[ 	]+.text
 [	 ]+770:[	 ]+7f0d 0000 0000 @IM+677a@[	 ]+@OC@.d \[(0x0|0 <notstart>)\],r7
 [ 	]+772:[ 	]+(R_CRIS_)?32[ 	]+.text
-
diff --git a/gas/testsuite/gas/cris/binop-cmpmovx.d b/gas/testsuite/gas/cris/binop-cmpmovx.d
index 6ec56668aa..183ff14a18 100644
--- a/gas/testsuite/gas/cris/binop-cmpmovx.d
+++ b/gas/testsuite/gas/cris/binop-cmpmovx.d
@@ -230,4 +230,3 @@ Disassembly of section \.text:
 [ 	]+3c2:[ 	]+(R_CRIS_)?32[ 	]+\.text
 [	 ]+3c8:[	 ]+7f0d 0000 0000 @IM+5448@[	 ]+@OC@\.w \[(0x0|0 <notstart>)\],r4
 [ 	]+3ca:[ 	]+(R_CRIS_)?32[ 	]+\.text
-
diff --git a/gas/testsuite/gas/cris/binop.d b/gas/testsuite/gas/cris/binop.d
index 4ea0452741..c9b715120d 100644
--- a/gas/testsuite/gas/cris/binop.d
+++ b/gas/testsuite/gas/cris/binop.d
@@ -567,5 +567,3 @@ Disassembly of section \.text:
 
 00000a92 <end>:
 	\.\.\.
-
-
diff --git a/gas/testsuite/gas/cris/binop.s b/gas/testsuite/gas/cris/binop.s
index a1c8857834..d5a3f8103a 100644
--- a/gas/testsuite/gas/cris/binop.s
+++ b/gas/testsuite/gas/cris/binop.s
@@ -911,4 +911,3 @@ start:
  @OC@.d [notstart],r7,r9
 
 end:
-
diff --git a/gas/testsuite/gas/cris/brokw-2.d b/gas/testsuite/gas/cris/brokw-2.d
index c641ba06c3..2604687706 100644
--- a/gas/testsuite/gas/cris/brokw-2.d
+++ b/gas/testsuite/gas/cris/brokw-2.d
@@ -23,4 +23,3 @@ Disassembly of section \.text:
 0000801c <sym3>:
 [	 ]+801c:[	 ]+4402[ 	]+moveq[ ]+4,r0
 ^[ 	]+\.\.\.
-
diff --git a/gas/testsuite/gas/cris/clear.d b/gas/testsuite/gas/cris/clear.d
index e542983e47..37ff3b0194 100644
--- a/gas/testsuite/gas/cris/clear.d
+++ b/gas/testsuite/gas/cris/clear.d
@@ -321,5 +321,3 @@ Disassembly of section \.text:
 
 000005ea <end>:
 	\.\.\.
-
-
diff --git a/gas/testsuite/gas/cris/continue.s b/gas/testsuite/gas/cris/continue.s
index 89e82f5d65..54fbd58bcf 100644
--- a/gas/testsuite/gas/cris/continue.s
+++ b/gas/testsuite/gas/cris/continue.s
@@ -1,7 +1,6 @@
 ; Test line continuation, making sure a commented line is not
-; broken up.
+; broken up and that a continued line is.
  .text
 start:
 ; 	move.d r1,[r8]@ move.d r2,[r8]
  	move.d r7,[r8]@ move.d r9,[r8]
-
diff --git a/gas/testsuite/gas/cris/fragtest.s b/gas/testsuite/gas/cris/fragtest.s
index ebc951bb1d..0efeed9c84 100644
--- a/gas/testsuite/gas/cris/fragtest.s
+++ b/gas/testsuite/gas/cris/fragtest.s
@@ -64,7 +64,3 @@ l11:
         nop
         .space  122,0
 l12:
-
-
-
-
diff --git a/gas/testsuite/gas/cris/jump-type.d b/gas/testsuite/gas/cris/jump-type.d
index 17f0519dfb..6d6959ef87 100644
--- a/gas/testsuite/gas/cris/jump-type.d
+++ b/gas/testsuite/gas/cris/jump-type.d
@@ -217,4 +217,3 @@ Disassembly of section \.text:
 
 0000043e <end>:
 	\.\.\.
-
diff --git a/gas/testsuite/gas/cris/nosep.s b/gas/testsuite/gas/cris/nosep.s
index f1840b8616..549f6f7e03 100644
--- a/gas/testsuite/gas/cris/nosep.s
+++ b/gas/testsuite/gas/cris/nosep.s
@@ -5,4 +5,3 @@
 start:
  moveq 0,r2;nop
  di
-
diff --git a/gas/testsuite/gas/cris/pushpop.d b/gas/testsuite/gas/cris/pushpop.d
index 50904d155a..ab21008d06 100644
--- a/gas/testsuite/gas/cris/pushpop.d
+++ b/gas/testsuite/gas/cris/pushpop.d
@@ -87,4 +87,3 @@ Disassembly of section \.text:
 [	 ]+13c:[	 ]+6e2e[ 	]+pop[ ]+r2
 [	 ]+13e:[	 ]+6e3e[ 	]+pop[ ]+r3
 [	 ]+140:[	 ]+fce1 eedf[ 	]+push[ ]+r13
-
diff --git a/gas/testsuite/gas/cris/quick.s b/gas/testsuite/gas/cris/quick.s
index 7302980067..a5d7925856 100644
--- a/gas/testsuite/gas/cris/quick.s
+++ b/gas/testsuite/gas/cris/quick.s
@@ -48,4 +48,3 @@ signed6:		; s6
  @OC@	-1,r13			; s6
  @OC@	-twenty2+21,r12		; s6
 end:
-
diff --git a/gas/testsuite/gas/cris/range-err-2.s b/gas/testsuite/gas/cris/range-err-2.s
index 1cd09bc23d..be0ec9478f 100644
--- a/gas/testsuite/gas/cris/range-err-2.s
+++ b/gas/testsuite/gas/cris/range-err-2.s
@@ -7,4 +7,3 @@ start:
  moveq external_symbol,r0 ; { dg-error "Semantics error" }
  addq external_symbol,r0 ; { dg-error "Semantics error" }
  break external_symbol ; { dg-error "Semantics error" }
-
diff --git a/gas/testsuite/gas/cris/rd-pic-1.s b/gas/testsuite/gas/cris/rd-pic-1.s
index 743b345482..87e60b830d 100644
--- a/gas/testsuite/gas/cris/rd-pic-1.s
+++ b/gas/testsuite/gas/cris/rd-pic-1.s
@@ -29,4 +29,3 @@ start:
 	sub.d [r12+extsym3:GOT16-156],r9,r8
 	move.d [r11+extsym14:GOTPLT16-256],r9
 	add.d [r10+extsym3:GOTPLT+56],r7,r8
-
diff --git a/gas/testsuite/gas/cris/sep-err-1.s b/gas/testsuite/gas/cris/sep-err-1.s
index 678446f4a6..4a6f7a9d89 100644
--- a/gas/testsuite/gas/cris/sep-err-1.s
+++ b/gas/testsuite/gas/cris/sep-err-1.s
@@ -3,4 +3,3 @@
  .text
 start:
  nop|moveq 0,r10 ; { dg-error "Unknown opcode" }
-
diff --git a/gas/testsuite/gas/cris/sreg-to-x.d b/gas/testsuite/gas/cris/sreg-to-x.d
index f03c6b1286..8e12d6ed58 100644
--- a/gas/testsuite/gas/cris/sreg-to-x.d
+++ b/gas/testsuite/gas/cris/sreg-to-x.d
@@ -213,4 +213,3 @@ Disassembly of section \.text:
 [ 	]+438:[ 	]+(R_CRIS_)?32[ 	]+.text
 0000043e <end>:
 ^[ 	]+\.\.\.
-
diff --git a/gas/testsuite/gas/cris/test.d b/gas/testsuite/gas/cris/test.d
index 565a8cef6d..4deb8e5bd0 100644
--- a/gas/testsuite/gas/cris/test.d
+++ b/gas/testsuite/gas/cris/test.d
@@ -321,4 +321,3 @@ Disassembly of section \.text:
 
 000005ea <end>:
 	\.\.\.
-
diff --git a/gas/testsuite/gas/cris/x-to-byte-sreg.d b/gas/testsuite/gas/cris/x-to-byte-sreg.d
index abc6e99462..31f6d48857 100644
--- a/gas/testsuite/gas/cris/x-to-byte-sreg.d
+++ b/gas/testsuite/gas/cris/x-to-byte-sreg.d
@@ -91,4 +91,3 @@ Disassembly of section \.text:
 [ 	]+140:[ 	]+(R_CRIS_)?32[ 	]+\.text
 00000146 <end>:
 ^[ 	]+\.\.\.
-
diff --git a/gas/testsuite/gas/cris/x-to-dword-sreg.d b/gas/testsuite/gas/cris/x-to-dword-sreg.d
index 84416f90e2..71482fff97 100644
--- a/gas/testsuite/gas/cris/x-to-dword-sreg.d
+++ b/gas/testsuite/gas/cris/x-to-dword-sreg.d
@@ -179,4 +179,3 @@ Disassembly of section \.text:
 [ 	]+39a:[ 	]+(R_CRIS_)?32[ 	]+externalsym
 [	 ]+3a0:[	 ]+7f0d 0000 0000 @IM+300a@[ 	]+move[ ]+\[(0x0|0 <notstart>)\],.*
 [ 	]+3a2:[ 	]+(R_CRIS_)?32[ 	]+\.text
-
diff --git a/gas/testsuite/gas/cris/x-to-word-sreg.d b/gas/testsuite/gas/cris/x-to-word-sreg.d
index 204e4dd6ce..e2fa482a84 100644
--- a/gas/testsuite/gas/cris/x-to-word-sreg.d
+++ b/gas/testsuite/gas/cris/x-to-word-sreg.d
@@ -150,4 +150,3 @@ Disassembly of section \.text:
 [ 	]+28c:[ 	]+(R_CRIS_)?32[ 	]+\.text
 00000292 <end>:
 ^[ 	]+\.\.\.
-