diff --git a/doc/build.xml b/doc/build.xml
index b67b0cd..9a42ed7 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -13,6 +13,12 @@
           value="com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.dom.client;com.google.gwt.i18n.client;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.http.client" />
 	<property name="LANG_PKGS" value="java.lang;java.lang.annotation;java.util;java.io;java.sql" />
 
+	<!--	Individual classes to include when we don't want to 
+		include an entire package.
+	-->
+	<property name="USER_CLASSES"
+	value="${gwt.root}/user/src/com/google/gwt/junit/tools/GWTTestSuite.java" />
+
 	<!--
 		*** Note that if the USER_SOURCE_PATH paths are updated,
 		the fileset dependencies in the outofdate tags in the
@@ -86,7 +92,7 @@
 					<arg value="-examplepackages" />
 					<arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client;com.google.gwt.examples.rpc.server;com.google.gwt.examples.benchmarks" />
 					<arg value="-packages" />
-					<arg value="${USER_PKGS}" />
+					<arg value="${USER_PKGS};${USER_CLASSES}" />
 				</java>
 			</sequential>
 		</outofdate>