diff --git a/assembly/project.xml b/assembly/project.xml
index f582522c67..90acadc892 100755
--- a/assembly/project.xml
+++ b/assembly/project.xml
@@ -38,9 +38,8 @@
         </properties>
       </dependency>
 
-      <!--
       <dependency>
-        <groupId>activemq</groupId>
+        <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-optional</artifactId>
         <version>${pom.currentVersion}</version>
         <properties>
@@ -48,7 +47,6 @@
           <optional>true</optional>
         </properties>
       </dependency>
-      -->
 
       <dependency>
         <groupId>activeio</groupId>
diff --git a/assembly/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml b/assembly/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
index 655809eeb4..209cb0ecf3 100644
--- a/assembly/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
+++ b/assembly/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
@@ -17,7 +17,7 @@
 <beans xmlns="http://activemq.org/config/1.0">
 
 
-  <broker name="receiver" persistent="false" useJmx="false">
+  <broker brokerName="receiver" persistent="false" useJmx="false">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
     </transportConnectors>
diff --git a/assembly/src/test/resources/org/apache/activemq/usecases/receiver-http.xml b/assembly/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
index f53f5a6b16..25adb6aafb 100644
--- a/assembly/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
+++ b/assembly/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
@@ -16,7 +16,7 @@
 -->
 <beans xmlns="http://activemq.org/config/1.0">
 
-  <broker name="receiver" persistent="false">
+  <broker brokerName="receiver" persistent="false">
     <transportConnectors>
       <transportConnector uri="http://localhost:62302"/>
     </transportConnectors>
diff --git a/assembly/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml b/assembly/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
index 61e233a29b..9e0fef1ec6 100644
--- a/assembly/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
+++ b/assembly/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
@@ -16,7 +16,7 @@
 -->
 <beans xmlns="http://activemq.org/config/1.0">
 
-  <broker name="sender" persistent="false" useJmx="false">
+  <broker brokerName="sender" persistent="false" useJmx="false">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
     </transportConnectors>
diff --git a/assembly/src/test/resources/org/apache/activemq/usecases/sender-http.xml b/assembly/src/test/resources/org/apache/activemq/usecases/sender-http.xml
index 3cda0424b8..cc98615eb6 100644
--- a/assembly/src/test/resources/org/apache/activemq/usecases/sender-http.xml
+++ b/assembly/src/test/resources/org/apache/activemq/usecases/sender-http.xml
@@ -16,7 +16,7 @@
 -->
 <beans xmlns="http://activemq.org/config/1.0">
 
-  <broker name="sender" persistent="false">
+  <broker brokerName="sender" persistent="false">
     <transportConnectors>
       <transportConnector uri="http://localhost:62301"/>
     </transportConnectors>