diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 411540f55f1..0dad075ffa6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-30  Janis Johnson  <janis187@us.ibm.com>
+
+	* lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
+	scan-tree-dump-not, scan-tree-dump-dem, scan-tree-dump-dem-not):
+	Strip options from test name.
+
 2005-03-31  Jan Hubicka  <jh@suse.cz>
 
 	* gcc.dg/varpool-1.c: New testcase.
diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp
index 76d1a59fb60..935e068761e 100644
--- a/gcc/testsuite/lib/scantree.exp
+++ b/gcc/testsuite/lib/scantree.exp
@@ -49,7 +49,8 @@ proc scan-tree-dump { args } {
     upvar 2 name testcase
 
     # This must match the rule in gcc-dg.exp.
-    set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]"
+    set src [file tail [lindex $testcase 0]]
+    set output_file "[glob $src.t??.[lindex $args 1]]"
 
     set fd [open $output_file r]
     set text [read $fd]
@@ -91,7 +92,8 @@ proc scan-tree-dump-times { args } {
     upvar 2 name testcase
 
     # This must match the rule in gcc-dg.exp.
-    set output_file "[glob [file tail $testcase].t??.[lindex $args 2]]"
+    set src [file tail [lindex $testcase 0]]
+    set output_file "[glob $src.t??.[lindex $args 2]]"
 
     set fd [open $output_file r]
     set text [read $fd]
@@ -128,7 +130,8 @@ proc scan-tree-dump-not { args } {
     }
 
     upvar 2 name testcase
-    set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]"
+    set src [file tail [lindex $testcase 0]]
+    set output_file "[glob $src.t??.[lindex $args 1]]"
 
     set fd [open $output_file r]
     set text [read $fd]
@@ -179,7 +182,8 @@ proc scan-tree-dump-dem { args } {
     }
 
     upvar 2 name testcase
-    set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]"
+    set src [file tail [lindex $testcase 0]]
+    set output_file "[glob $src.t??.[lindex $args 1]]"
 
     set fd [open "| $cxxfilt < $output_file" r]
     set text [read $fd]
@@ -229,7 +233,8 @@ proc scan-tree-dump-dem-not { args } {
     }
 
     upvar 2 name testcase
-    set output_file "[glob [file tail $testcase].t??.[lindex $args 1]]"
+    set src [file tail [lindex $testcase 0]]
+    set output_file "[glob $src.t??.[lindex $args 1]]"
 
     set fd [open "| $cxxfilt < $output_file" r]
     set text [read $fd]