diff --git a/user/src/com/google/gwt/junit/junit.html b/user/src/com/google/gwt/junit/junit.html
index 4efef11..1029f82 100644
--- a/user/src/com/google/gwt/junit/junit.html
+++ b/user/src/com/google/gwt/junit/junit.html
@@ -17,6 +17,7 @@
 <head>
 <meta name='gwt:onLoadErrorFn' content='junitOnLoadErrorFn'>
 <meta name='gwt:onPropertyErrorFn' content='junitOnPropertyErrorFn'>
+<base href="__MODULE_BASE__">
 </head>
 <body>
 <script language='javascript'>
@@ -26,7 +27,6 @@
 }
 
 function junitOnPropertyErrorFn(propName, allowedValues, badValue) {
-  alert(propName);
   var msg = 'While attempting to load the module, property "' + propName;
   if (badValue != null) {
     msg += '" was set to the unexpected value "' + badValue + '"';
diff --git a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
index f30d477..573d0df 100644
--- a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
+++ b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
@@ -107,6 +107,7 @@
       response.setContentType("text/html");
       PrintWriter writer = response.getWriter();
       String htmlSrc = Utility.getFileFromClassPath("com/google/gwt/junit/junit.html");
+      htmlSrc = htmlSrc.replace("__MODULE_BASE__", prefix + "/");
       htmlSrc = htmlSrc.replace("__MODULE_NAME__", prefix + "/" + moduleName);
       writer.write(htmlSrc);
       return;