diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win
index 9e7f95c25c4..44455885f19 100644
--- a/mozilla/java/webclient/src_moz/Makefile.win
+++ b/mozilla/java/webclient/src_moz/Makefile.win
@@ -166,6 +166,7 @@ buildRunems:
 !ifndef PACKAGE_BUILD
 	@echo +++ Creating runem.bat.  Use this to run the test browser.
 	rm -f runem.bat
+	@echo SET PATH=%%PATH%%;$(JDKHOME)\jre\bin $(PERL) ..\src_share\runem.pl org.mozilla.webclient.test.EmbeddedMozillaImpl $(DEPTH) %1% >> runem.bat
 	@echo $(PERL) ..\src_share\runem.pl org.mozilla.webclient.test.EmbeddedMozillaImpl $(DEPTH) %1% >> runem.bat
 !endif
 !endif
diff --git a/mozilla/java/webclient/src_share/runem.pl b/mozilla/java/webclient/src_share/runem.pl
index 643461d0915..12e4b63f7cd 100644
--- a/mozilla/java/webclient/src_share/runem.pl
+++ b/mozilla/java/webclient/src_share/runem.pl
@@ -96,9 +96,9 @@ if ($IS_UNIX) {
 }
 
 # stock the CLASSPATH
-$ENV{"CLASSPATH"} = $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "tools.jar" . 
-  $CPSEP . $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "rt.jar" . $CPSEP . 
-  $ENV{"CLASSPATH"};
+#$ENV{"CLASSPATH"} = $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "tools.jar" . 
+#  $CPSEP . $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "rt.jar" . $CPSEP . 
+#  $ENV{"CLASSPATH"};
 if ($IS_UNIX) {
   $ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . ".." . 
     $SEP . "classes";
@@ -115,10 +115,6 @@ $cmd = $JAVA_CMD;
 if ($SEP eq "/") {
   $cmd = $cmd . " -native";
 }
-else {
-  # workaround bug 64332 on Win32, turn off hotspot and JIT
-  $cmd = $cmd . " -classic -Djava.compiler=NONE";
-}
 
 #tack on the java library path
 $cmd = $cmd . " -Djava.library.path=" . $BINDIR . $CPSEP . $BINDIR . $SEP . "components";
@@ -127,7 +123,9 @@ if ($IS_UNIX) {
   $cmd = $cmd . " -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n";
 }
 else {
-  $cmd = $cmd . " -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n";
+  if ($ENV{"MOZ_DEBUG"}) {
+    $cmd = $cmd . " -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n";
+  }
 }
 #tack on the classpath, class name, and bin dir
 $cmd = $cmd . " -classpath " . $ENV{"CLASSPATH"} . " " . $CLASSNAME . " " . 
@@ -142,4 +140,4 @@ if ($MIN_ARGC < $ARGC) {
 
 print $cmd . "\n";
 
-exec $cmd;
+system($cmd);