diff --git a/archive/org.eclipse.wtp.releng/testScripts/test.xml b/archive/org.eclipse.wtp.releng/testScripts/test.xml
index 4eb7b5b98f1bb1d050852351e96d44242a82c995..bc49d29d40af67797a01b36efd431cd7e2f54f83 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.xml
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.xml
@@ -96,17 +96,20 @@
 	</target>
 
 	<target name="wst-server-tests" description="Runs the org.eclipse.wst.server.*.tests test.xml">
-		<antcall target="runtests">
+		<antcall target="runapitests">
 			<param name="testPlugin" value="${org.eclipse.wst.server.core.tests}" />
 			<param name="report" value="org.eclipse.wst.server.core.tests" />
+			<param name="package.includes" value="org.eclipse.wst.server."/>
 		</antcall>
-		<antcall target="runtests">
+		<antcall target="runapitests">
 			<param name="testPlugin" value="${org.eclipse.wst.server.ui.tests}" />
 			<param name="report" value="org.eclipse.wst.server.ui.tests" />
+			<param name="package.includes" value="org.eclipse.wst.server."/>
 		</antcall>
-		<antcall target="runtests">
+		<antcall target="runapitests">
 			<param name="testPlugin" value="${org.eclipse.wst.server.util.tests}" />
 			<param name="report" value="org.eclipse.wst.server.util.tests" />
+			<param name="package.includes" value="org.eclipse.wst.server."/>
 		</antcall>
 	</target>
 	
@@ -181,9 +184,10 @@
 	</target>
 	
 	<target name="wst-common-tests" description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-		<antcall target="runtests">
+		<antcall target="runapitests">
 			<param name="testPlugin" value="${org.eclipse.wst.common.tests}" />
 			<param name="report" value="org.eclipse.wst.common.tests" />
+			<param name="package.includes" value="org.eclipse.wst.common.componentcore."/>
 		</antcall>
 	</target>