diff --git a/releng/org.eclipse.cdt.releng/index.xsl b/releng/org.eclipse.cdt.releng/index.xsl
index 06abde15c48..8c4cef49685 100644
--- a/releng/org.eclipse.cdt.releng/index.xsl
+++ b/releng/org.eclipse.cdt.releng/index.xsl
@@ -55,7 +55,7 @@
 		        <xsl:attribute name="href">
 			    <xsl:text>logs/</xsl:text>
 			    <xsl:value-of select="substring-after(@name,'CDT Build ')"/>
-			    <xsl:text>/org.eclipse.cdt.core.tests.html</xsl:text>
+			    <xsl:text>/org.eclipse.cdt.core.tests.xml</xsl:text>
 			</xsl:attribute>
 			org.eclipse.cdt.core.tests
 		    </a>
diff --git a/releng/org.eclipse.cdt.releng/main.xsl b/releng/org.eclipse.cdt.releng/main.xsl
index d2a33d8496b..d6d54fc9330 100644
--- a/releng/org.eclipse.cdt.releng/main.xsl
+++ b/releng/org.eclipse.cdt.releng/main.xsl
@@ -205,8 +205,6 @@
 				<move todir="test">
 					<fileset dir="eclipse"/>
 				</move>
-				<unzip src="zips/org.eclipse.test_2.1.0.zip" dest="test/plugins"/>
-				<unzip src="zips/org.eclipse.ant.optional.junit_2.1.0.zip" dest="test/plugins"/>
 		
 				<xsl:for-each select="projects/plugin|projects/feature">
 					<unjar>
@@ -227,21 +225,15 @@
 				</xsl:for-each>
 				
 				<!-- Run the tests -->
-				<chmod perm="+x" file="test/eclipse"/>
+				<chmod file="test/eclipse" perm="+x"/>
+				<mkdir dir="logs/${{build.version}}.${{build.number}}"/>
 				<exec executable="${{basedir}}/test/eclipse" dir="test">
 					<arg line="-nosplash"/>
-					<arg line="-application org.eclipse.ant.core.antRunner"/>
-					<arg line="-buildfile plugins/org.eclipse.cdt.core.tests_${{build.version}}.${{build.number}}/test.xml"/>
-					<arg line="-Dorg.eclipse.test=org.eclipse.test_2.1.0"/>
-					<arg line="-Declipse-home=${{basedir}}/test"/>
+					<arg line="-application org.eclipse.cdt.core.tests.runTests"/>
+					<arg line="-testout ../logs/${{build.version}}.${{build.number}}/org.eclipse.cdt.core.tests.xml"/>
+					<arg line="-testreport ../../testReport.xsl"/>
 				</exec>
-		
-				<!-- Create the reports -->
-				<delete dir="logs"/>
-					<xslt in="test/org.eclipse.cdt.core.tests.xml"
-						out="logs/${{build.version}}.${{build.number}}/org.eclipse.cdt.core.tests.html"
-						style="junit.xsl"/>
-		
+
 				<!-- Add our version to site.xml -->
 				<tstamp>
 					<format property="build.date" pattern="EEE MMM d HH:mm:ss z yyyy"/>
@@ -269,10 +261,11 @@
 						<include name="plugins/*.jar"/>
 						<include name="features/*.jar"/>
 						<include name="dist/*.zip"/>
-						<include name="logs/**/*.html"/>
+						<include name="logs/**/*.xml"/>
 						<include name="build.number"/>
 						<include name="index.html"/>
 						<include name="site.xml"/>
+						<include name="testReport.xsl"/>
 					</fileset>
 				</ftp>
 			</target>
@@ -286,7 +279,7 @@
 				</mail>
 			</target>
 	
-			<target name="all" depends="build,upload,mail"/>
+			<target name="all" depends="build,test,upload,mail"/>
 			<!-- test removed since it doesn't work right now -->
 			
 		</project>
diff --git a/releng/org.eclipse.cdt.releng/testReport.xsl b/releng/org.eclipse.cdt.releng/testReport.xsl
new file mode 100644
index 00000000000..64f085e0cc0
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/testReport.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:template match="/testRun">
+		<html>
+			<head><title>Test Results for <xsl:value-of select="@name"/></title></head>
+			<body>
+				<h2>Summary Table for <xsl:value-of select="@name"/></h2>
+				<p>Some day...</p>
+				<xsl:apply-templates/>
+			</body>
+		</html>
+	</xsl:template>
+	
+	<xsl:template match="testSuite">
+		<h2>Test Suite: <xsl:value-of select="@name"/></h2>
+		<table border="2" cellspacing="0" width="100%">
+			<tr><th>Result</th><th>Time (s)</th><th>Test</th></tr>
+			<xsl:apply-templates/>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="test">
+		<tr>
+			<td><xsl:value-of select="@result"/></td>
+			<td><xsl:value-of select="@time"/></td>
+			<td>
+				<xsl:value-of select="../@name"/><br></br>::<xsl:value-of select="@name"/>
+			</td>
+		</tr>
+	</xsl:template>
+	
+</xsl:transform>
