diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cd14bf9c3f29532d2df71280a02742e41a34ec8..4f9a0002cbc09149568b32a377fa91e276100033 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-28  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* lib/gfortran-dg.exp: Remove trailing whitespace.
+	* lib/fortran-torture.exp: Test with -fbounds-check instead of
+	-funroll-all-loops.
+
 2005-12-28  Alan Modra  <amodra@bigpond.net.au>
 
 	* gcc.dg/torture/fp-int-convert-timode.c: Don't test IBM
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 2f05ba55c4627ebb83809244301198936d968131..b4e61941d96d5afc6d3b08457a0043a985fbcc57 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -34,7 +34,7 @@ if ![info exists TORTURE_OPTIONS] {
 	{ -O0 } { -O1 } { -O2 } \
 	{ -O2 -fomit-frame-pointer -finline-functions } \
 	{ -O2 -fomit-frame-pointer -finline-functions -funroll-loops } \
-	{ -O2 -fomit-frame-pointer -finline-functions -funroll-all-loops } \
+	{ -O2 -fbounds-check } \
 	{ -O2 -fno-repack-arrays } \
 	{ -O3 -g } \
 	{ -Os }]
diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp
index 3314b330158f2c1035d25daff803c2263a7f15e6..6ceb7fc3255545538b10ff21e382b53ded9f717b 100644
--- a/gcc/testsuite/lib/gfortran-dg.exp
+++ b/gcc/testsuite/lib/gfortran-dg.exp
@@ -92,7 +92,7 @@ proc gfortran-dg-runtest { testcases default-extra-flags } {
 	# look if this is dg-do-run test, in which case
 	# we cycle through the option list, otherwise we don't
 	if [expr [search_for $test "dg-do run"]] {
-	    set option_list $TORTURE_OPTIONS			         
+	    set option_list $TORTURE_OPTIONS
 	} else {
 	    set option_list [list { -O } ]
 	}