diff --git a/pom.xml b/pom.xml
index 347e483..ce5bb00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,9 +89,6 @@
     <module>tests/org.eclipse.wst.server.http.core.tests</module>
     <module>tests/org.eclipse.wst.server.util.tests</module>
 
-    <module>tests/org.eclipse.jst.server.tomcat.tests.performance</module>
-    <module>tests/org.eclipse.wst.server.tests.performance</module>
-
     <module>site</module>
   </modules>
 
@@ -111,6 +108,8 @@
         <module>tests/org.eclipse.jst.server.ui.tests</module>
         <module>tests/org.eclipse.wst.internet.monitor.ui.tests</module>
         <module>tests/org.eclipse.wst.server.ui.tests</module>
+        <module>tests/org.eclipse.jst.server.tomcat.tests.performance</module>
+        <module>tests/org.eclipse.wst.server.tests.performance</module>
 
         <module>site-integration</module>
       </modules>
diff --git a/site-integration/category.xml b/site-integration/category.xml
index 88fa3db..4978640 100644
--- a/site-integration/category.xml
+++ b/site-integration/category.xml
@@ -9,6 +9,9 @@
     <bundle id="org.eclipse.wst.internet.monitor.ui.tests"><category name="site-integration"/></bundle>
     <bundle id="org.eclipse.wst.server.ui.tests"><category name="site-integration"/></bundle>
 
+    <bundle id="org.eclipse.jst.server.tomcat.tests.performance"><category name="site"/></bundle>
+    <bundle id="org.eclipse.wst.server.tests.performance"><category name="site"/></bundle>
+
     <feature id="org.eclipse.jst.server_adapters.ext_tests.feature"><category name="site-integration"/></feature>
     <feature id="org.eclipse.wst.server_tests.feature"><category name="site-integration"/></feature>
     <feature id="org.eclipse.jst.server_tests.feature"><category name="site-integration"/></feature>
@@ -23,6 +26,9 @@
     <bundle id="org.eclipse.wst.internet.monitor.ui.tests.source"/>
     <bundle id="org.eclipse.wst.server.ui.tests.source"/>
 
+    <bundle id="org.eclipse.jst.server.tomcat.tests.performance.source"/>
+    <bundle id="org.eclipse.wst.server.tests.performance.source"/>
+
     <!-- <feature id="org.eclipse.jst.server_adapters.ext_tests.feature.source"/> -->
     <!-- <feature id="org.eclipse.wst.server_tests.feature.source"/> -->
     <!-- <feature id="org.eclipse.jst.server_tests.feature.source"/> -->
diff --git a/site/category.xml b/site/category.xml
index 78de92e..a51daeb 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -10,7 +10,6 @@
     <feature id="org.eclipse.jst.server_userdoc.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_sdk.feature"><category name="site"/></feature>
 
-
     <feature id="org.eclipse.wst.server_adapters.feature"><category name="site"/></feature>
     <feature id="org.eclipse.wst.server_adapters.sdk.feature"><category name="site"/></feature>
     <feature id="org.eclipse.wst.server_core.feature"><category name="site"/></feature>
@@ -51,9 +50,6 @@
     <bundle id="org.eclipse.wst.server.http.core.tests"><category name="site"/></bundle>
     <bundle id="org.eclipse.wst.server.util.tests"><category name="site"/></bundle>
 
-    <bundle id="org.eclipse.jst.server.tomcat.tests.performance"><category name="site"/></bundle>
-    <bundle id="org.eclipse.wst.server.tests.performance"><category name="site"/></bundle>
-
     <!-- sources -->
 
     <!-- Bug 531426 - sdk.features contain no plugins (just other features) so won't produce .source bundles -->
@@ -102,9 +98,6 @@
     <bundle id="org.eclipse.wst.server.http.core.tests.source"/>
     <bundle id="org.eclipse.wst.server.util.tests.source"/>
 
-    <bundle id="org.eclipse.jst.server.tomcat.tests.performance.source"/>
-    <bundle id="org.eclipse.wst.server.tests.performance.source"/>
-
     <category-def name="site" label="Web Tools (WTP) Server Tools"><description/></category-def>
 
 </site>