diff --git a/build.xml b/build.xml
index af2a1e288..d36dbb381 100644
--- a/build.xml
+++ b/build.xml
@@ -29,6 +29,7 @@
 		<exclude name="Console/cake.bat" />
 		<exclude name="Console/cake.php" />
 		<exclude name="Console/cake" />
+		<exclude name="./lib/Cake/Test" />
 	</fileset>
 
 	<!--
@@ -40,10 +41,6 @@
 		<include name="cake" />
 	</fileset>
 
-	<fileset id="non-tests" dir="./lib/Cake">
-		<exclude name=".lib/Cake/Test" />
-	</fileset>
-
 	<!-- start fresh each time.  Remove the dist and build dirs -->
 	<target name="clean">
 		<delete dir="${build.dir}" includeemptydirs="true" />
@@ -140,7 +137,6 @@
 				<package name="PHPUnit" channel="pear.phpunit.de" minimum_version="3.5.0" type="optional" />
 			</dependencies>
 			<dirroles key="bin">script</dirroles>
-			<dirroles key="Cake/Test">php</dirroles>
 			<dirroles key="Cake/Console/Templates/skel">php</dirroles>
 			<dirroles key="Cake/Console/Templates/default">php</dirroles>
 			<dirroles key="Cake/View">php</dirroles>
@@ -244,11 +240,11 @@
 			<formatter type="pmd" outfile="pmd-cpd.xml"/>
 		</phpcpd>
 		<phpdepend>
-			<fileset refid="non-tests" />
+			<fileset refid="libs" />
 			<logger type="jdepend-xml" outfile="jdepend.xml"/>
 		</phpdepend>
 		<phpmd rulesets="codesize,unusedcode,design">
-			<fileset refid="non-tests" />
+			<fileset refid="libs" />
 			<formatter type="xml" outfile="reports/pmd.html"/>
 		</phpmd>
 	</target>