diff --git a/blacktie/test/blacktie-linux.sh b/blacktie/test/blacktie-linux.sh
index 2b2dbef56d..7c9aae37ef 100755
--- a/blacktie/test/blacktie-linux.sh
+++ b/blacktie/test/blacktie-linux.sh
@@ -15,7 +15,7 @@ fi
 
 # KILL ANY PREVIOUS BUILD REMNANTS
 ps -f
-for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 killall -9 testsuite
 killall -9 server
 killall -9 client
@@ -35,7 +35,7 @@ fi
 ant -f $WORKSPACE/blacktie/test/initializeBlackTie.xml -Dbasedir=.. -DJBOSS_HOME=$JBOSS_HOME -DBT_HOME=$WORKSPACE/blacktie/target/dist/ -DVERSION=5.0.0.M4-SNAPSHOT -DMACHINE_ADDR=`hostname` -DJBOSSAS_IP_ADDR=$JBOSSAS_IP_ADDR -DBLACKTIE_DIST_HOME=$BLACKTIE_DIST_HOME initializeJBoss initializeBlackTie -debug
 if [ "$?" != "0" ]; then
 	ps -f
-	for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+	for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 	killall -9 testsuite
 	killall -9 server
 	killall -9 client
@@ -47,14 +47,14 @@ export JBOSS_HOME=
 chmod u+x $WORKSPACE/jboss-as/bin/standalone.sh
 
 # START JBOSS
-$WORKSPACE/jboss-as/bin/standalone.sh -c standalone-full.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR&
+$WORKSPACE/jboss-as/bin/standalone.sh -c standalone-blacktie.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR&
 sleep 20
 
 # TWEAK txfooapp FOR THIS NODE
 ant -f $WORKSPACE/blacktie/test/initializeBlackTie.xml tweak-txfooapp-for-environment
 if [ "$?" != "0" ]; then
 	ps -f
-	for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+	for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 	killall -9 testsuite
 	killall -9 server
 	killall -9 client
@@ -68,7 +68,7 @@ chmod u+x $WORKSPACE/blacktie/target/dist/blacktie-5.0.0.M4-SNAPSHOT/setenv.sh
 . $WORKSPACE/blacktie/target/dist/blacktie-5.0.0.M4-SNAPSHOT/setenv.sh
 if [ "$?" != "0" ]; then
 	ps -f
-	for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+	for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 	killall -9 testsuite
 	killall -9 server
 	killall -9 client
@@ -84,7 +84,7 @@ cd $WORKSPACE/blacktie/
 ./run_all_quickstarts.sh
 if [ "$?" != "0" ]; then
 	ps -f
-	for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+	for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 	killall -9 testsuite
 	killall -9 server
 	killall -9 client
@@ -95,7 +95,7 @@ fi
 
 # KILL ANY BUILD REMNANTS
 ps -f
-for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
+for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done
 killall -9 testsuite
 killall -9 server
 killall -9 client
diff --git a/blacktie/test/blacktie-vc9x32.bat b/blacktie/test/blacktie-vc9x32.bat
index 0bf615293a..f8de940425 100644
--- a/blacktie/test/blacktie-vc9x32.bat
+++ b/blacktie/test/blacktie-vc9x32.bat
@@ -23,7 +23,7 @@ set JBOSS_HOME=
 
 rem START JBOSS
 cd %WORKSPACE%\jboss-as\bin
-start /B standalone.bat -c standalone-full.xml -Djboss.bind.address=%JBOSSAS_IP_ADDR% -Djboss.bind.address.unsecure=%JBOSSAS_IP_ADDR%
+start /B standalone.bat -c standalone-blacktie.xml -Djboss.bind.address=%JBOSSAS_IP_ADDR% -Djboss.bind.address.unsecure=%JBOSSAS_IP_ADDR%
 echo "Started server"
 @ping 127.0.0.1 -n 20 -w 1000 > nul
 
diff --git a/blacktie/test/initializeBlackTie.xml b/blacktie/test/initializeBlackTie.xml
index fe488b8bc9..55048ea5c6 100755
--- a/blacktie/test/initializeBlackTie.xml
+++ b/blacktie/test/initializeBlackTie.xml
@@ -22,27 +22,28 @@
         <copy todir="jboss-as">
             <fileset dir="${JBOSS_HOME}"/>
         </copy>
+        <copy file="jboss-as/docs/examples/configs/standalone-blacktie.xml" tofile="jboss-as/standalone/configuration/standalone-blacktie.xml" overwrite="true" />
         <echo file="jboss-as/bin/standalone.conf.bat" append="true">set "JAVA_OPTS=%JAVA_OPTS% -DOrbPortabilityEnvironmentBean.resolveService=NAME_SERVICE"</echo>
 	<echo file="jboss-as/bin/standalone.conf" append="true">JAVA_OPTS="$JAVA_OPTS -DOrbPortabilityEnvironmentBean.resolveService=NAME_SERVICE"</echo>
 	<!-- Enable transactions for the orb -->
-        <replaceregexp byline="true" match="&quot;spec&quot;" replace="&quot;on&quot;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&quot;spec&quot;" replace="&quot;on&quot;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Enable JTS -->
-        <replaceregexp byline="true" match="&lt;coordinator-environment default-timeout=&quot;300&quot;/&gt;" replace="&lt;coordinator-environment default-timeout=&quot;300&quot;/&gt;&#10;            &lt;jts/&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;coordinator-environment default-timeout=&quot;300&quot;/&gt;" replace="&lt;coordinator-environment default-timeout=&quot;300&quot;/&gt;&#10;            &lt;jts/&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Enable log4j categories -->
-        <replaceregexp byline="true" match="&lt;root-logger&gt;" replace="&lt;logger category=&quot;org.jboss.ejb.client&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.jboss.as.ejb3&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.jboss.narayana.blacktie&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.codehaus.stomp&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.hornetq&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;root-logger&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;root-logger&gt;" replace="&lt;logger category=&quot;org.jboss.ejb.client&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.jboss.as.ejb3&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.jboss.narayana.blacktie&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.codehaus.stomp&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;logger category=&quot;org.hornetq&quot;&gt;&#10;                &lt;level name=&quot;ALL&quot;/&gt;&#10;            &lt;/logger&gt;&#10;            &lt;root-logger&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Add some jms-destinations for BlackTie to use -->
-        <replaceregexp byline="true" match="&lt;/hornetq-server&gt;" replace="&lt;jms-destinations&gt;&#10;                    &lt;jms-queue name=&quot;BTR_TestOne&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_TestOne&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_TestOne&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTR_TestTwo&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_TestTwo&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_TestTwo&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTC_ConvService&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTC_ConvService&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTC_ConvService&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTR_JAVA_Converse&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_JAVA_Converse&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_JAVA_Converse&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-topic name=&quot;BTR_JAVA_Topic&quot;&gt;&#10;                        &lt;entry name=&quot;topic/BTR_JAVA_Topic&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/topic/BTR_JAVA_Topic&quot;/&gt;&#10;                    &lt;/jms-topic&gt;&lt;/jms-destinations&gt;&#10;                    &#10;            &lt;/hornetq-server&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;/hornetq-server&gt;" replace="&lt;jms-destinations&gt;&#10;                    &lt;jms-queue name=&quot;BTR_TestOne&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_TestOne&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_TestOne&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTR_TestTwo&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_TestTwo&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_TestTwo&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTC_ConvService&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTC_ConvService&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTC_ConvService&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-queue name=&quot;BTR_JAVA_Converse&quot;&gt;&#10;                        &lt;entry name=&quot;queue/BTR_JAVA_Converse&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/queue/BTR_JAVA_Converse&quot;/&gt;&#10;                    &lt;/jms-queue&gt;&#10;                    &lt;jms-topic name=&quot;BTR_JAVA_Topic&quot;&gt;&#10;                        &lt;entry name=&quot;topic/BTR_JAVA_Topic&quot;/&gt;&#10;                        &lt;entry name=&quot;java:jboss/exported/jms/topic/BTR_JAVA_Topic&quot;/&gt;&#10;                    &lt;/jms-topic&gt;&lt;/jms-destinations&gt;&#10;                    &#10;            &lt;/hornetq-server&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Configure security settings for the queues -->
-        <replaceregexp byline="true" match="&lt;security-settings&gt;" replace="&lt;security-settings&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_BTDomainAdmin&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;blacktie&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;blacktie&quot;/&gt;&#10;                    &lt;/security-setting&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_BTStompAdmin&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;blacktie&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;blacktie&quot;/&gt;&#10;                    &lt;/security-setting&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;security-settings&gt;" replace="&lt;security-settings&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_BTDomainAdmin&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;blacktie&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;blacktie&quot;/&gt;&#10;                    &lt;/security-setting&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_BTStompAdmin&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;blacktie&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;blacktie&quot;/&gt;&#10;                    &lt;/security-setting&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Allow the role blacktie for access -->
         <replaceregexp byline="true" match="#guest=guest" replace="guest=guest,blacktie&#10;
 dynsub=guest,blacktie,dynsub" file="jboss-as/standalone/configuration/application-roles.properties"/>
 	<!-- Add some security settings for the quickstarts -->
-        <replaceregexp byline="true" match="&lt;security-settings&gt;" replace="&lt;security-settings&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_SECURE&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;dynsub&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;dynsub&quot;/&gt;&#10;                    &lt;/security-setting&gt;&#10;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;security-settings&gt;" replace="&lt;security-settings&gt;&#10;                    &lt;security-setting match=&quot;jms.queue.BTR_SECURE&quot;&gt;&#10;                       &lt;permission type=&quot;send&quot; roles=&quot;dynsub&quot;/&gt;&#10;                       &lt;permission type=&quot;consume&quot; roles=&quot;dynsub&quot;/&gt;&#10;                    &lt;/security-setting&gt;&#10;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Disable dead connection testing for the invm connection factory -->
-        <replaceregexp byline="true" match="&lt;connection-factory name=&quot;InVmConnectionFactory&quot;&gt;" replace="&lt;connection-factory name=&quot;InVmConnectionFactory&quot;&gt;&#10;                        &lt;connection-ttl&gt;-1&lt;/connection-ttl&gt;&#10;                        &lt;client-failure-check-period&gt;86400000&lt;/client-failure-check-period&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;connection-factory name=&quot;InVmConnectionFactory&quot;&gt;" replace="&lt;connection-factory name=&quot;InVmConnectionFactory&quot;&gt;&#10;                        &lt;connection-ttl&gt;-1&lt;/connection-ttl&gt;&#10;                        &lt;client-failure-check-period&gt;86400000&lt;/client-failure-check-period&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 	<!-- Disable dead connection testing for the hornetq-ra connection factory -->
-        <replaceregexp byline="true" match="&lt;pooled-connection-factory name=&quot;hornetq-ra&quot;&gt;" replace="&lt;pooled-connection-factory name=&quot;hornetq-ra&quot;&gt;&#10;                        &lt;connection-ttl&gt;-1&lt;/connection-ttl&gt;&#10;                        &lt;client-failure-check-period&gt;86400000&lt;/client-failure-check-period&gt;" file="jboss-as/standalone/configuration/standalone-full.xml"/>
+        <replaceregexp byline="true" match="&lt;pooled-connection-factory name=&quot;hornetq-ra&quot;&gt;" replace="&lt;pooled-connection-factory name=&quot;hornetq-ra&quot;&gt;&#10;                        &lt;connection-ttl&gt;-1&lt;/connection-ttl&gt;&#10;                        &lt;client-failure-check-period&gt;86400000&lt;/client-failure-check-period&gt;" file="jboss-as/standalone/configuration/standalone-blacktie.xml"/>
 
 	<copy todir="jboss-as/" overwrite="true">
 		<fileset dir="blacktie/test/config/"/>
@@ -89,7 +90,6 @@ dynsub=guest,blacktie,dynsub" file="jboss-as/standalone/configuration/applicatio
         </replaceregexp>
         <copy todir="jboss-as/standalone/deployments">
             <fileset dir="${BT_HOME}blacktie-${VERSION}/blacktie-admin-services/">
-                <include name="*.jar"/>
                 <include name="*.ear"/>
             </fileset>
         </copy>