diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 146c2b63c8d..d6d3feb7935 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-08  Jason Merrill  <jason@casey.cygnus.com>
+
+	* lib/g++.exp (g++_init): Don't put { } around -fmessage-length=0.
+	(g++_target_compile): Put test-specific options last.
+
 2000-03-08  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* g++.old-deja/g++.eh/vbase4.C: New test.
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 27cbd8ae7dd..917a063f472 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -133,7 +133,7 @@ proc g++_init { args } {
 
     # Make sure that lines are not wrapped.  That can confuse the
     # error-message parsing machinery.
-    lappend ALWAYS_CXXFLAGS "additional_flags={-fmessage-length=0}"
+    lappend ALWAYS_CXXFLAGS "additional_flags=-fmessage-length=0"
 
     verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS"
 
@@ -156,9 +156,9 @@ proc g++_target_compile { source dest type options } {
     lappend options "additional_flags=[libio_include_flags]"
     lappend options "compiler=$GXX_UNDER_TEST";
 
-    set options [concat $options $gpp_compile_options]
+    set options [concat $gpp_compile_options $options]
 
-    set options [concat $options "$ALWAYS_CXXFLAGS"];
+    set options [concat "$ALWAYS_CXXFLAGS" $options];
 
     if { [regexp "(^| )-frepo( |$)" $options] && \
 	 [regexp "\.o(|bj)$" $dest] } then {