diff --git a/activemq-systest/maven.xml b/activemq-systest/maven.xml
index 24231bd6d3..582c9333ee 100755
--- a/activemq-systest/maven.xml
+++ b/activemq-systest/maven.xml
@@ -30,7 +30,7 @@
 
 		<delete dir="target/test"/>
 					
-		<taskdef name="systest" classname="org.activemq.systest.task.SystemTestTask">
+		<taskdef name="systest" classname="org.apache.activemq.systest.task.SystemTestTask">
 	      <classpath refid="test.classpath"/>
 	    </taskdef>
 	    
diff --git a/activemq-systest/project.xml b/activemq-systest/project.xml
index 9b494a9139..b998eb50ef 100755
--- a/activemq-systest/project.xml
+++ b/activemq-systest/project.xml
@@ -11,19 +11,19 @@
   </shortDescription>
   <description>System Testing Framework for ActiveMQ</description>
 
-  <package>org.activemq.systest</package>
+  <package>org.apache.activemq.systest</package>
   <packageGroups>
     <packageGroup>
       <title>The core APIs of the system testing agents</title>
-      <packages>org.activemq.systest</packages>
+      <packages>org.apache.activemq.systest</packages>
     </packageGroup>
     <packageGroup>
       <title>The single VM implementations</title>
-      <packages>org.activemq.systest.impl.vm</packages>
+      <packages>org.apache.activemq.systest.impl.vm</packages>
     </packageGroup>
     <packageGroup>
       <title>The testing use cases and scenarios</title>
-      <packages>org.activemq.systest.usecase.*</packages>
+      <packages>org.apache.activemq.systest.usecase.*</packages>
     </packageGroup>
   </packageGroups>
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/Agent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/Agent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java
index 82594cf5ef..e184fc1849 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/Agent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  *
diff --git a/activemq-systest/src/main/java/org/activemq/systest/AgentStopper.java b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java
similarity index 98%
rename from activemq-systest/src/main/java/org/activemq/systest/AgentStopper.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java
index 0a696fdd15..3d348fa065 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/AgentStopper.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  * A helper class used to stop a bunch of services, catching and logging any
diff --git a/activemq-systest/src/main/java/org/activemq/systest/AgentSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/AgentSupport.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java
index 3bd473886a..432299191c 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/AgentSupport.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  * A helper class for working with agents
diff --git a/activemq-systest/src/main/java/org/activemq/systest/BrokerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java
similarity index 97%
rename from activemq-systest/src/main/java/org/activemq/systest/BrokerAgent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java
index 55318e68fd..a9a2d62d43 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/BrokerAgent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.ConnectionFactory;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ClientAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/ClientAgent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java
index 25e0cc352b..43b1f793c3 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ClientAgent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java
@@ -16,7 +16,7 @@
  * 
  **/
 
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.Destination;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ConsumerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/ConsumerAgent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java
index b78fe9f3b4..8b505cb646 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ConsumerAgent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  * 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/DestinationFactory.java b/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/DestinationFactory.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java
index 23ebfae4bc..b12b21f68e 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/DestinationFactory.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/MessageList.java b/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java
similarity index 97%
rename from activemq-systest/src/main/java/org/activemq/systest/MessageList.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java
index b65ecad00b..8903412d0e 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/MessageList.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.JMSException;
 import javax.jms.MessageProducer;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ProducerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/ProducerAgent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java
index 799c0c8f55..17366e1aa2 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ProducerAgent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.JMSException;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/QueueOnlyScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/QueueOnlyScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java
index cc1ad166fd..618540b8c2 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/QueueOnlyScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  * A marker interface to indicate that a Scenario only works with queues
diff --git a/activemq-systest/src/main/java/org/activemq/systest/Scenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/Scenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java
index 837fbb0e84..611128a21a 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/Scenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java
@@ -16,7 +16,7 @@
  * 
  **/
 
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import javax.jms.Destination;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ScenarioSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java
similarity index 98%
rename from activemq-systest/src/main/java/org/activemq/systest/ScenarioSupport.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java
index 00a301abde..ae58254eac 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ScenarioSupport.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ScenarioTestCase.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java
similarity index 98%
rename from activemq-systest/src/main/java/org/activemq/systest/ScenarioTestCase.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java
index b1f7a6483d..6f653f10c2 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ScenarioTestCase.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/ScenarioTestSuite.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java
similarity index 99%
rename from activemq-systest/src/main/java/org/activemq/systest/ScenarioTestSuite.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java
index cda6f27a78..24518b4246 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/ScenarioTestSuite.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 import org.springframework.context.ApplicationContext;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/TopicOnlyScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/TopicOnlyScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java
index f57b0a9917..b6a6594880 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/TopicOnlyScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest;
+package org.apache.activemq.systest;
 
 /**
  * A marker interface to indicate that a Scenario only works with queues
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/AgentMessageListener.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java
similarity index 98%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/AgentMessageListener.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java
index 83a1ce1921..2eb5b9b9b7 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/AgentMessageListener.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/BrokerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java
similarity index 91%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/BrokerAgentImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java
index 2c0e65b77d..277d3a01b1 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/BrokerAgentImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java
@@ -15,14 +15,14 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.broker.BrokerService;
-import org.activemq.network.NetworkConnector;
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.AgentSupport;
-import org.activemq.systest.BrokerAgent;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.AgentSupport;
+import org.apache.activemq.systest.BrokerAgent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/ConsumerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/ConsumerAgentImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java
index 249845b9f6..e680c3ec86 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/ConsumerAgentImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java
@@ -15,11 +15,11 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
 
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/DestinationFactoryImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java
similarity index 82%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/DestinationFactoryImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java
index 813bf678dc..8edb23174e 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/DestinationFactoryImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java
@@ -15,13 +15,13 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQTempQueue;
-import org.activemq.command.ActiveMQTempTopic;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.systest.DestinationFactory;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTempQueue;
+import org.apache.activemq.command.ActiveMQTempTopic;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.systest.DestinationFactory;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/DiscoveryBrokerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java
similarity index 87%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/DiscoveryBrokerAgentImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java
index 3fbbc4f7ed..65bc56a9a3 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/DiscoveryBrokerAgentImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java
@@ -15,11 +15,11 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.network.NetworkConnector;
-import org.activemq.systest.BrokerAgent;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.systest.BrokerAgent;
 
 /**
  * A broker using discovery
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/JmsClientSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java
similarity index 94%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/JmsClientSupport.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java
index ed48628d81..e1f73a3cc3 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/JmsClientSupport.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java
@@ -15,12 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.AgentSupport;
-import org.activemq.systest.BrokerAgent;
-import org.activemq.systest.ClientAgent;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.AgentSupport;
+import org.apache.activemq.systest.BrokerAgent;
+import org.apache.activemq.systest.ClientAgent;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/MessageListImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java
similarity index 97%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/MessageListImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java
index dc8b59ff19..b3b49d6e92 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/MessageListImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java
@@ -15,10 +15,10 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.MessageList;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.MessageList;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/ProducerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java
similarity index 93%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/ProducerAgentImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java
index 0e6e341696..4bc8596e32 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/ProducerAgentImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java
@@ -15,11 +15,11 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/RandomMessageListImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java
similarity index 94%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/RandomMessageListImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java
index 0d3a5621ac..b6f15a43f0 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/RandomMessageListImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java
@@ -15,9 +15,9 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.MessageList;
+import org.apache.activemq.systest.MessageList;
 
 /**
  * A {@link MessageList} implementation which generates a random body
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java
index 122178959c..9e4cad0492 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java
@@ -15,10 +15,10 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.systest.BrokerAgent;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.systest.BrokerAgent;
 
 import javax.jms.ConnectionFactory;
 
@@ -129,7 +129,7 @@ public class SeparateBrokerProcessAgentImpl extends SeparateProcessAgent impleme
 
     protected String createBrokerScript() {
         String version = null;
-        Package p = Package.getPackage("org.activemq");
+        Package p = Package.getPackage("org.apache.activemq");
         if (p != null) {
             version = p.getImplementationVersion();
         }
diff --git a/activemq-systest/src/main/java/org/activemq/systest/impl/SeparateProcessAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java
similarity index 96%
rename from activemq-systest/src/main/java/org/activemq/systest/impl/SeparateProcessAgent.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java
index bc1b3341cb..e06c4bec04 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/impl/SeparateProcessAgent.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java
@@ -15,10 +15,10 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.impl;
+package org.apache.activemq.systest.impl;
 
-import org.activemq.systest.AgentStopper;
-import org.activemq.systest.AgentSupport;
+import org.apache.activemq.systest.AgentStopper;
+import org.apache.activemq.systest.AgentSupport;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/task/ScenarioJClassStub.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java
similarity index 99%
rename from activemq-systest/src/main/java/org/activemq/systest/task/ScenarioJClassStub.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java
index 6ce00525a0..cdca2588ba 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/task/ScenarioJClassStub.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.task;
+package org.apache.activemq.systest.task;
 
 import org.codehaus.jam.JAnnotation;
 import org.codehaus.jam.JAnnotationValue;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/task/SystemTestGenerator.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java
similarity index 95%
rename from activemq-systest/src/main/java/org/activemq/systest/task/SystemTestGenerator.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java
index fdcd4574b5..b59b025989 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/task/SystemTestGenerator.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java
@@ -15,13 +15,13 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.task;
+package org.apache.activemq.systest.task;
 
-import org.activemq.systest.DestinationFactory;
-import org.activemq.systest.QueueOnlyScenario;
-import org.activemq.systest.Scenario;
-import org.activemq.systest.ScenarioTestSuite;
-import org.activemq.systest.TopicOnlyScenario;
+import org.apache.activemq.systest.DestinationFactory;
+import org.apache.activemq.systest.QueueOnlyScenario;
+import org.apache.activemq.systest.Scenario;
+import org.apache.activemq.systest.ScenarioTestSuite;
+import org.apache.activemq.systest.TopicOnlyScenario;
 import org.apache.tools.ant.DirectoryScanner;
 import org.codehaus.jam.JClass;
 
@@ -184,8 +184,8 @@ public class SystemTestGenerator {
         writer.println(" **/");
         writer.println("package " + packageName + ";");
         writer.println();
-        writer.println("import org.activemq.systest.DestinationFactory;");
-        writer.println("import org.activemq.systest.ScenarioTestSuite;");
+        writer.println("import org.apache.activemq.systest.DestinationFactory;");
+        writer.println("import org.apache.activemq.systest.ScenarioTestSuite;");
         writer.println("import " + type.getQualifiedName() + ";");
         writer.println("import org.springframework.context.ApplicationContext;");
         writer.println("import org.springframework.context.support.FileSystemXmlApplicationContext;");
diff --git a/activemq-systest/src/main/java/org/activemq/systest/task/SystemTestTask.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java
similarity index 99%
rename from activemq-systest/src/main/java/org/activemq/systest/task/SystemTestTask.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java
index bd0b94f943..8160f4b3e3 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/task/SystemTestTask.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java
@@ -1,4 +1,4 @@
-package org.activemq.systest.task;
+package org.apache.activemq.systest.task;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
diff --git a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java
similarity index 84%
rename from activemq-systest/src/main/java/org/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java
index c61a3542c2..bca298b422 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java
@@ -15,12 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.usecase.network;
+package org.apache.activemq.systest.usecase.network;
 
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
-import org.activemq.systest.ScenarioSupport;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.ScenarioSupport;
 
 import javax.jms.Destination;
 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/SingleBrokerScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java
similarity index 83%
rename from activemq-systest/src/main/java/org/activemq/systest/usecase/network/SingleBrokerScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java
index 2a3ba94514..bc05860f81 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/SingleBrokerScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java
@@ -15,12 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.usecase.network;
+package org.apache.activemq.systest.usecase.network;
 
-import org.activemq.systest.BrokerAgent;
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.BrokerAgent;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
 
 /**
  * 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java
similarity index 81%
rename from activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java
index 40c1b76f8f..4d18517efa 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java
@@ -15,13 +15,13 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.usecase.network;
+package org.apache.activemq.systest.usecase.network;
 
-import org.activemq.systest.BrokerAgent;
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
-import org.activemq.systest.QueueOnlyScenario;
+import org.apache.activemq.systest.BrokerAgent;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.QueueOnlyScenario;
 
 /**
  * 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java
similarity index 82%
rename from activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java
index 54c5ce9701..01223290b3 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java
@@ -15,12 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.usecase.network;
+package org.apache.activemq.systest.usecase.network;
 
-import org.activemq.systest.BrokerAgent;
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.BrokerAgent;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
 
 /**
  * 
diff --git a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java
similarity index 87%
rename from activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java
rename to activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java
index 4e91adbe86..10dd6e65ac 100644
--- a/activemq-systest/src/main/java/org/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java
+++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java
@@ -15,12 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.systest.usecase.network;
+package org.apache.activemq.systest.usecase.network;
 
-import org.activemq.systest.BrokerAgent;
-import org.activemq.systest.ConsumerAgent;
-import org.activemq.systest.MessageList;
-import org.activemq.systest.ProducerAgent;
+import org.apache.activemq.systest.BrokerAgent;
+import org.apache.activemq.systest.ConsumerAgent;
+import org.apache.activemq.systest.MessageList;
+import org.apache.activemq.systest.ProducerAgent;
 
 /**
  * 
diff --git a/activemq-systest/src/test/resources/brokers/broker.xml b/activemq-systest/src/test/resources/brokers/broker.xml
index 31827a0b94..b9cdb983e1 100644
--- a/activemq-systest/src/test/resources/brokers/broker.xml
+++ b/activemq-systest/src/test/resources/brokers/broker.xml
@@ -4,17 +4,17 @@
 <beans>
   
   <bean id="broker1" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="true"></property>
   </bean>
 
   <bean id="broker2" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="true"></property>
   </bean>
 
   <bean id="broker3" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="true"></property>
   </bean>
 
diff --git a/activemq-systest/src/test/resources/brokers/broker_non_persistent.xml b/activemq-systest/src/test/resources/brokers/broker_non_persistent.xml
index 76e475b29e..707deff6ef 100644
--- a/activemq-systest/src/test/resources/brokers/broker_non_persistent.xml
+++ b/activemq-systest/src/test/resources/brokers/broker_non_persistent.xml
@@ -4,17 +4,17 @@
 <beans>
 
   <bean id="broker1" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
   <bean id="broker2" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
   <bean id="broker3" singleton="false"
-    class="org.activemq.systest.impl.BrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.BrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
diff --git a/activemq-systest/src/test/resources/brokers/broker_non_persistent_discovery.xml b/activemq-systest/src/test/resources/brokers/broker_non_persistent_discovery.xml
index 263d9de21d..6a8f0c3fd4 100644
--- a/activemq-systest/src/test/resources/brokers/broker_non_persistent_discovery.xml
+++ b/activemq-systest/src/test/resources/brokers/broker_non_persistent_discovery.xml
@@ -4,17 +4,17 @@
 <beans>
 
   <bean id="broker1" singleton="false"
-    class="org.activemq.systest.impl.DiscoveryBrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.DiscoveryBrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
   <bean id="broker2" singleton="false"
-    class="org.activemq.systest.impl.DiscoveryBrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.DiscoveryBrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
   <bean id="broker3" singleton="false"
-    class="org.activemq.systest.impl.DiscoveryBrokerAgentImpl">
+    class="org.apache.activemq.systest.impl.DiscoveryBrokerAgentImpl">
     <property name="persistent" value="false"></property>
   </bean>
 
diff --git a/activemq-systest/src/test/resources/brokers/broker_separate_process.xml b/activemq-systest/src/test/resources/brokers/broker_separate_process.xml
index c42f51d085..90b5a503a4 100644
--- a/activemq-systest/src/test/resources/brokers/broker_separate_process.xml
+++ b/activemq-systest/src/test/resources/brokers/broker_separate_process.xml
@@ -4,17 +4,17 @@
 <beans>
 
   <bean id="broker1" singleton="false"
-    class="org.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
+    class="org.apache.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
     <constructor-arg value="localhost"/>
   </bean>
 
   <bean id="broker2" singleton="false"
-    class="org.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
+    class="org.apache.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
     <constructor-arg value="localhost"/>
   </bean>
 
   <bean id="broker3" singleton="false"
-    class="org.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
+    class="org.apache.activemq.systest.impl.SeparateBrokerProcessAgentImpl">
     <constructor-arg value="localhost"/>
   </bean>
 
diff --git a/activemq-systest/src/test/resources/clients/durable.xml b/activemq-systest/src/test/resources/clients/durable.xml
index e00dc64e85..d35f73f23e 100644
--- a/activemq-systest/src/test/resources/clients/durable.xml
+++ b/activemq-systest/src/test/resources/clients/durable.xml
@@ -5,24 +5,24 @@
 
   <!--  types of producer -->
   <bean id="durableProducer" singleton="false"
-    class="org.activemq.systest.impl.ProducerAgentImpl">
+    class="org.apache.activemq.systest.impl.ProducerAgentImpl">
     <property name="persistent" value="true" />
   </bean>
 
   <!--  types of consumer -->
   <bean id="consumer" singleton="false"
-    class="org.activemq.systest.impl.ConsumerAgentImpl">
+    class="org.apache.activemq.systest.impl.ConsumerAgentImpl">
   </bean>
 
   <!--  types of messageList -->
   <bean id="messageList"
-    class="org.activemq.systest.impl.MessageListImpl">
+    class="org.apache.activemq.systest.impl.MessageListImpl">
     <constructor-arg value="10" />
     <constructor-arg value="100" />
   </bean>
 
   <!--  destination factory -->
   <bean id="destinationFactory"
-    class="org.activemq.systest.impl.DestinationFactoryImpl"/>
+    class="org.apache.activemq.systest.impl.DestinationFactoryImpl"/>
 
 </beans>
diff --git a/activemq-systest/src/test/resources/clients/durableTransacted.xml b/activemq-systest/src/test/resources/clients/durableTransacted.xml
index c4831f6b7c..8a2e1df31c 100644
--- a/activemq-systest/src/test/resources/clients/durableTransacted.xml
+++ b/activemq-systest/src/test/resources/clients/durableTransacted.xml
@@ -5,25 +5,25 @@
 
   <!--  types of producer -->
   <bean id="durableTransactedProducer" singleton="false"
-    class="org.activemq.systest.impl.ProducerAgentImpl">
+    class="org.apache.activemq.systest.impl.ProducerAgentImpl">
     <property name="persistent" value="true" />
     <property name="transacted" value="true" />
   </bean>
 
   <!--  types of consumer -->
   <bean id="consumer" singleton="false"
-    class="org.activemq.systest.impl.ConsumerAgentImpl">
+    class="org.apache.activemq.systest.impl.ConsumerAgentImpl">
   </bean>
 
   <!--  types of messageList -->
   <bean id="messageList"
-    class="org.activemq.systest.impl.MessageListImpl">
+    class="org.apache.activemq.systest.impl.MessageListImpl">
     <constructor-arg value="10" />
     <constructor-arg value="100" />
   </bean>
 
   <!--  destination factory -->
   <bean id="destinationFactory"
-    class="org.activemq.systest.impl.DestinationFactoryImpl"/>
+    class="org.apache.activemq.systest.impl.DestinationFactoryImpl"/>
 
 </beans>
diff --git a/activemq-systest/src/test/resources/clients/nonDurable.xml b/activemq-systest/src/test/resources/clients/nonDurable.xml
index ebe900ba85..053eac4a8f 100644
--- a/activemq-systest/src/test/resources/clients/nonDurable.xml
+++ b/activemq-systest/src/test/resources/clients/nonDurable.xml
@@ -5,24 +5,24 @@
 
   <!--  types of producer -->
   <bean id="nonDurableProducer" singleton="false"
-    class="org.activemq.systest.impl.ProducerAgentImpl">
+    class="org.apache.activemq.systest.impl.ProducerAgentImpl">
     <property name="persistent" value="false" />
   </bean>
 
   <!--  types of consumer -->
   <bean id="consumer" singleton="false"
-    class="org.activemq.systest.impl.ConsumerAgentImpl">
+    class="org.apache.activemq.systest.impl.ConsumerAgentImpl">
   </bean>
 
   <!--  types of messageList -->
   <bean id="messageList"
-    class="org.activemq.systest.impl.MessageListImpl">
+    class="org.apache.activemq.systest.impl.MessageListImpl">
     <constructor-arg value="10" />
     <constructor-arg value="100" />
   </bean>
 
   <!--  destination factory -->
   <bean id="destinationFactory"
-    class="org.activemq.systest.impl.DestinationFactoryImpl"/>
+    class="org.apache.activemq.systest.impl.DestinationFactoryImpl"/>
 
 </beans>
diff --git a/activemq-systest/src/test/resources/clients/nonDurableTransacted.xml b/activemq-systest/src/test/resources/clients/nonDurableTransacted.xml
index 348478fd64..211207ae8b 100644
--- a/activemq-systest/src/test/resources/clients/nonDurableTransacted.xml
+++ b/activemq-systest/src/test/resources/clients/nonDurableTransacted.xml
@@ -5,25 +5,25 @@
 
   <!--  types of producer -->
   <bean id="nonDurableTransactedProducer" singleton="false"
-    class="org.activemq.systest.impl.ProducerAgentImpl">
+    class="org.apache.activemq.systest.impl.ProducerAgentImpl">
     <property name="persistent" value="false" />
     <property name="transacted" value="true" />
   </bean>
 
   <!--  types of consumer -->
   <bean id="consumer" singleton="false"
-    class="org.activemq.systest.impl.ConsumerAgentImpl">
+    class="org.apache.activemq.systest.impl.ConsumerAgentImpl">
   </bean>
 
   <!--  types of messageList -->
   <bean id="messageList"
-    class="org.activemq.systest.impl.MessageListImpl">
+    class="org.apache.activemq.systest.impl.MessageListImpl">
     <constructor-arg value="10" />
     <constructor-arg value="100" />
   </bean>
 
   <!--  destination factory -->
   <bean id="destinationFactory"
-    class="org.activemq.systest.impl.DestinationFactoryImpl"/>
+    class="org.apache.activemq.systest.impl.DestinationFactoryImpl"/>
 
 </beans>
diff --git a/activemq-systest/src/test/resources/log4j.properties b/activemq-systest/src/test/resources/log4j.properties
index 5620bbb624..68756657ac 100755
--- a/activemq-systest/src/test/resources/log4j.properties
+++ b/activemq-systest/src/test/resources/log4j.properties
@@ -4,8 +4,8 @@
 log4j.rootLogger=INFO, out
 #log4j.rootLogger=DEBUG, stdout
 
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default