diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 47b08a42831..9a2e9b38b5a 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-14  Mark Wielaard  <mark@klomp.org>
+
+	* lib/libjava.exp (test_libjava_from_javac): Don't create .o files
+	containing $ characters and always quote class files with "'"s.
+
 2003-02-14  Mark Wielaard  <mark@klomp.org>
 
 	* libjava.mauve/mauve.exp (mauve_compute_uses): Add inner class
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 05cf08fe8e3..d9aa178d654 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -787,8 +787,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
     if {$mode == "compile"} {
 	foreach c_file $class_files {
 	    set executable [file rootname [file tail $c_file]].o
+	    # Don't write files which contain $ chars.
+	    set executable [string map {$ ^} $executable]
 	    set x [libjava_prune_warnings \
-		     [libjava_tcompile $c_file "$executable" $type $args]]
+		     [libjava_tcompile '$c_file' "$executable" $type $args]]
 	    lappend removeList $executable
 	    if {$x != ""} {
 		break