diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 94d06a0e10..ec129c74a8 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -446,15 +446,11 @@
         </configuration>
       </plugin>
 
-      <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
+          <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
-          <useManifestOnlyJar>false</useManifestOnlyJar>
           <runOrder>alphabetical</runOrder>
 
            <systemProperties>
@@ -473,488 +469,10 @@
               <value>file:target/test-classes/log4j.properties</value>
             </property>
             -->
-          </systemProperties>
-          <includes>
-            <include>**/*Test.*</include>
-          </includes>
-          <excludes>
-            <exclude>**/perf/SimpleDurableTopicTest.*</exclude>
-            <!-- These tests run too slow to execute as part of the unit tests -->
-            <exclude>**/TransactionNotStartedErrorTest.*</exclude>
-            <exclude>**/DefaultStoreBrokerTest.*</exclude>
-            <exclude>**/TcpTransportBrokerTest.*</exclude>
-            <exclude>**/activeio/*</exclude>
-
-            <!-- These are performance tests so take too long to run -->
-            <exclude>**/perf/*</exclude>
-
-            <!-- These are load tests so take too long to run -->
-            <exclude>**/load/*</exclude>
-
-            <!-- http://jira.activemq.org/jira/browse/AMQ-626 -->
-            <exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
-            <exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
-            <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
-
-            <!--  these seem to fail only in m2 -->
-            <!--<exclude>**/TransactedTopicMasterSlaveTest.*</exclude>-->
-
-            <!-- Multicast and UDP based tests fail on GBuild -->
-            <exclude>**/PeerTransportTest.*</exclude>
-            <exclude>**/MulticastTransportTest.*</exclude>
-            <exclude>**/MulticastNetworkTest.*</exclude>
-            <exclude>**/UnreliableUdpTransportTest.*</exclude>
-            <exclude>**/SslTransportBrokerTest.*</exclude>
-
-            <!-- this one is a little flaky and can fail on some platforms randomly -->
-            <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
-            <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
-            <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
-
-            <!-- m2 tests failing since move from assembly  -->
-            <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
-            <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
-
-            <!-- This test only works on machines which have ssh propertly configured -->
-            <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
-
-            <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
-            <exclude>**/FailoverConsumerTest.*</exclude>
-
-            <!-- The NIO implemenation is not working properly on OS X.. -->
-            <exclude>**/nio/**</exclude>
-            <exclude>**/NioQueueSubscriptionTest.*/</exclude>
-
-             <!-- A test used for memory profiling only. -->
-             <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
-
-             <!-- used just to test potential memory leaks manually -->
-             <exclude>**/JDBCTestMemory.*</exclude>
-
-             <exclude>**/amq1490/*</exclude>
-             <exclude>**/archive/*</exclude>
-             <exclude>**/NetworkFailoverTest.*/**</exclude>
-
-             <exclude>**/vm/VMTransportBrokerTest.*</exclude>
-             <exclude>**/broker/MarshallingBrokerTest.*</exclude>
-
-
-            <exclude>**/AMQDeadlockTest3.*</exclude>
-
-            <!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
-            <exclude>**/ProxyConnectorTest.*</exclude>
-
-            <!-- breaks hudson: disable till we get a chance to give it the time that it needs - http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/ -->
-            <exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
-            <exclude>**/DoSTest.*</exclude>
-
-            <!-- Don't run the openwire encoding tests since the test and impls are code generated -->
-            <exclude>org/apache/activemq/openwire/v*/**</exclude>
-
-            <!-- this is a list of our slowest tests (slowest on top).. disabled to bring the build down to about 30 min -->
-            <exclude>org/apache/activemq/camel/TransactedConsumeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/JdbcDurableSubDupTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ1893Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/TopicReplicationTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3120Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2149KahaDBTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DispatchMultipleConsumersTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2183Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/UnlimitedEnqueueTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubProcessTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/TempStoreDataCleanupTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2356Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/MemoryUsageCleanupTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2870Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2584Test.*</exclude>
-            <exclude>org/apache/activemq/broker/virtual/MirroredQueueCorrectMemoryUsageTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ1936Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/SlowConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/MissingDataFileTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/AMQ1925Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3732Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2512Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3567Test.*</exclude>
-            <exclude>org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2149Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBVersionTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionSelectorTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompNIOSSLLoadTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompLoadTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompSSLLoadTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompNIOLoadTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkLoadTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/TempStorageBlockedBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/NegativeQueueTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverPriorityTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2983Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3140Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/CompositePublishTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/DoubleExpireTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TopicProducerFlowControlTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TempTopicProducerFlowControlTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2314Test.*</exclude>
-            <exclude>org/apache/activemq/kaha/LoadTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompVirtualTopicTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2439Test.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverDuplicateTest.*</exclude>
-            <exclude>org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/ExpiryHogTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/BrowseOverNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.*</exclude>
-            <exclude>org/apache/kahadb/index/HashIndexTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveShutdownTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.*</exclude>
-            <exclude>org/apache/kahadb/index/BTreeIndexTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2021Test.*</exclude>
-            <exclude>org/apache/activemq/transport/SoWriteTimeoutTest.*</exclude>
-            <exclude>org/apache/activemq/usage/StoreUsageTest.*</exclude>
-            <exclude>org/apache/activemq/MessageEvictionTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/DurableConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.*</exclude>
-            <exclude>org/apache/activemq/proxy/ProxyFailoverTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionReactivationTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverComplexClusterTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/QueueDuplicatesTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.*</exclude>
-            <exclude>org/apache/activemq/console/command/AMQJournalToolTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/VMTransportClosureTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.*</exclude>
-            <exclude>org/apache/activemq/transport/http/HttpClientReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.*</exclude>
-            <exclude>org/apache/activemq/camel/component/InvokeRequestReplyUsingJmsReplyToHeaderTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/AMQ2927Test.*</exclude>
-            <exclude>org/apache/activemq/network/jms/QueueBridgeXBeanTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/TopicBridgeXBeanTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/TopicBridgeSpringTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/ReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/QueueBridgeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.*</exclude>
-            <exclude>org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.*</exclude>
-            <exclude>org/apache/activemq/PerDestinationStoreLimitTest.*</exclude>
-            <exclude>org/apache/activemq/transport/discovery/MasterSlaveDiscoveryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3445Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/InitalReconnectDelayTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverTransactionTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ClientRebalanceTest.*</exclude>
-            <exclude>org/apache/activemq/camel/JmsJdbcXATest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBTest.*</exclude>
-            <exclude>org/apache/activemq/broker/jmx/PurgeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/xbean/XBeanXmlTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/broker/scheduler/JmsSchedulerTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3625Test.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.*</exclude>
-            <exclude>org/apache/activemq/store/StorePerDestinationTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3167Test.*</exclude>
-            <exclude>org/apache/activemq/store/AutoStorePerDestinationTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2982Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/DataFileNotDeletedTest.*</exclude>
-            <exclude>org/apache/activemq/spring/ParallelXATransactionTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkRestartPlainTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkRestartTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.*</exclude>
-            <exclude>org/apache/activemq/camel/AMQ2611Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3352Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.*</exclude>
-            <exclude>org/apache/bugs/AMQ1730Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/ConnectionPerMessageTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.*</exclude>
-            <exclude>org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/transport/TopicClusterTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.*</exclude>
-            <exclude>org/apache/activemq/transport/mqtt/MTQQNioTest.*</exclude>
-            <exclude>org/apache/activemq/transport/mqtt/MQTTTest.*</exclude>
-            <exclude>org/apache/activemq/ra/FailoverManagedClusterTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.*</exclude>
-            <exclude>org/apache/activemq/transport/QueueClusterTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ExpiredMessagesTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.*</exclude>
-            <exclude>org/apache/activemq/network/DuplexNetworkMBeanTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionActivationTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/TopicMasterSlaveTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MessageReroutingTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerTempQueueNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.*</exclude>
-            <exclude>org/apache/activemq/transport/SoWriteTimeoutClientTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2401Test.*</exclude>
-            <exclude>org/apache/activemq/advisory/TempQueueMemoryTest.*</exclude>
-            <exclude>org/apache/activemq/network/FailoverStaticNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableSubscriptionOfflineTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2413Test.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/ConnectTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/UniquePropertyMessageEvictionStrategyTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.*</exclude>
-            <exclude>org/apache/activemq/JmsAutoAckListenerTest.*</exclude>
-            <exclude>org/apache/activemq/advisory/TempDestLoadTest.*</exclude>
-            <exclude>org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.*</exclude>
-            <exclude>org/apache/activemq/util/LRUCacheTest.*</exclude>
-            <exclude>org/apache/activemq/network/SimpleNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/broker/store/RecoverExpiredMessagesTest.*</exclude>
-            <exclude>org/apache/activemq/JmsClientAckListenerTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3157Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/ConsumerReceiveWithTimeoutTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryExpiryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2832Test.*</exclude>
-            <exclude>org/apache/activemq/RemoveDestinationTest.*</exclude>
-            <exclude>org/apache/activemq/network/DuplexNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkBrokerDetachTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/JmsTimeoutTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MessageGroupCloseTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2645Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2764Test.*</exclude>
-            <exclude>org/apache/kahadb/util/DataByteArrayInputStreamTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverClusterTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3529Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2751Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/DurableUnsubscribeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ConcurrentDestinationCreationTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/StaticNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/StartAndStopBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/util/DataByteArrayInputStreamTest.*</exclude>
-            <exclude>org/apache/activemq/broker/JdbcXARecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.*</exclude>
-            <exclude>org/apache/activemq/broker/virtual/VirtualTopicDLQTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ReliableReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3141Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/JournalDurableSubscriptionTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.*</exclude>
-            <exclude>org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2910Test.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ1853Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/MessageExpirationReaperTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/JMSDurableTopicNoLocalTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/DestinationGCTest.*</exclude>
-            <exclude>org/apache/activemq/web/AjaxTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/AdvisoryTopicCleanUpTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ1917Test.*</exclude>
-            <exclude>org/apache/activemq/console/command/TestPurgeCommand.*</exclude>
-            <exclude>org/apache/activemq/OnePrefetchAsyncConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2513Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/TransientQueueRedeliverTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/TopicRedeliverTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/QueueRedeliverTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverTransportBackupsTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MessageGroupDelayedTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompSslAuthTest.*</exclude>
-            <exclude>org/apache/activemq/QueueConsumerPriorityTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.*</exclude>
-            <exclude>org/apache/activemq/security/JaasNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3145Test.*</exclude>
-            <exclude>org/apache/activemq/broker/policy/AbortSlowConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCXACommitExceptionTest.*</exclude>
-            <exclude>org/apache/kahadb/index/ListIndexTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/JDBCDurableSubscriptionTest.*</exclude>
-            <exclude>org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.*</exclude>
-            <exclude>org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3274Test.*</exclude>
-            <exclude>org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/MemoryUsageBlockResumeTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/LargeQueueSparseDeleteTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverUpdateURIsTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/AMQStackOverFlowTest.*</exclude>
-            <exclude>org/apache/activemq/camel/component/ActiveMQRouteTest.*</exclude>
-            <exclude>org/apache/activemq/transport/tcp/InactivityMonitorTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkRemovesSubscriptionsTest.*</exclude>
-            <exclude>org/apache/activemq/console/command/TestAMQ3410.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/CursorDurableTest.*</exclude>
-            <exclude>org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompSslTest.*</exclude>
-            <exclude>org/apache/activemq/transport/http/HttpSpringTest.*</exclude>
-            <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/ActiveMQMessageAuditTest.*</exclude>
-            <exclude>org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.*</exclude>
-            <exclude>org/apache/activemq/spring/Spring2XmlNamespacesTest.*</exclude>
-            <exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude>
-            <exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude>
-            <exclude>org/apache/activemq/network/DemandForwardingBridgeFilterTest.*</exclude>
-            <exclude>org/apache/activemq/test/message/NestedMapMessageTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude>
-            <exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3454Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2171Test.*</exclude>
-            <exclude>org/apache/activemq/broker/RedeliveryRestartTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/KahaDBStoreTest.*</exclude>
-            <exclude>org/apache/activemq/TimeStampTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3324Test.*</exclude>
-            <exclude>org/apache/activemq/config/ConfigTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/NetworkAsyncStartTest.*</exclude>
-            <exclude>org/apache/bugs/LoadBalanceTest.*</exclude>
-            <exclude>org/apache/activemq/kaha/impl/index/hash/HashTest.*</exclude>
-            <exclude>org/apache/activemq/transport/fanout/FanoutTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ReconnectWithJMXEnabledTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/CraigsBugTest.*</exclude>
-            <exclude>org/apache/activemq/transport/tcp/SslBrokerServiceTest.*</exclude>
-            <exclude>org/apache/activemq/test/message/NestedMapAndListPropertyTest.*</exclude>
-            <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.*</exclude>
-            <exclude>org/apache/activemq/broker/XARecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.*</exclude>
-            <exclude>org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/BrokerConfigTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2084Test.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverRandomTest.*</exclude>
-            <exclude>org/apache/activemq/console/command/TestAMQ3411.*</exclude>
-            <exclude>org/apache/activemq/transport/vm/VMTransportWaitForTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/Stomp11Test.*</exclude>
-            <exclude>org/apache/activemq/xbean/ConnectorXBeanConfigTest.*</exclude>
-            <exclude>org/apache/activemq/broker/QueueMbeanRestartTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCStoreOrderTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/JMXRemoveQueueThenSendIgnoredTest.*</exclude>
-            <exclude>org/apache/activemq/ProducerFlowControlTest.*</exclude>
-            <exclude>org/apache/activemq/MessageListenerRedeliveryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2580Test.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.*</exclude>
-            <exclude>org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/spring/ListenerTest.*</exclude>
-            <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/camel/CamelVMTransportRoutingTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/FailoverTransportBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompNIOSSLTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/MessageGroupNewConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompAdvisoryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/amq1095/MessageSelectorTest.*</exclude>
-            <exclude>org/apache/activemq/web/RestTest.*</exclude>
-            <exclude>org/apache/activemq/ra/FailoverManagedConnectionTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3436Test.*</exclude>
-            <exclude>org/apache/activemq/plugin/BrokerStatisticsPluginTest.*</exclude>
-            <exclude>org/apache/activemq/command/MessageCompressionTest.*</exclude>
-            <exclude>org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.*</exclude>
-            <exclude>org/apache/activemq/camel/DlqTest.*</exclude>
-            <exclude>org/apache/activemq/blob/FilesystemBlobTest.*</exclude>
-            <exclude>org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.*</exclude>
-            <exclude>org/apache/activemq/security/LDAPSecurityTest.*</exclude>
-            <exclude>org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3622Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2200Test.*</exclude>
-            <exclude>org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2364Test.*</exclude>
-            <exclude>org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/security/XBeanSslContextTest.*</exclude>
-            <exclude>org/apache/activemq/transport/xmpp/XmppTest.*</exclude>
-            <exclude>org/apache/activemq/camel/SetHeaderTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompTest.*</exclude>
-            <exclude>org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.*</exclude>
-            <exclude>org/apache/activemq/camel/CamelDestinationExclusiveConsumerTest.*</exclude>
-            <exclude>org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.*</exclude>
-            <exclude>org/apache/activemq/camel/component/AutoExposeQueuesInCamelTest.*</exclude>
-            <exclude>org/apache/activemq/broker/RecoveryBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompNIOTest.*</exclude>
-            <exclude>org/apache/activemq/security/SecurityJMXTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2213Test.*</exclude>
-            <exclude>org/apache/activemq/config/BrokerXmlConfigFromJNDITest.*</exclude>
-            <exclude>org/apache/activemq/camel/component/JmsSimpleRequestReplyTest.*</exclude>
-            <exclude>org/apache/activemq/broker/jmx/MBeanTest.*</exclude>
-            <exclude>org/apache/activemq/JmsSendWithAsyncCallbackTest.*</exclude>
-            <exclude>org/apache/activemq/pool/ConnectionExpiryEvictsFromPoolTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2616Test.*</exclude>
-            <exclude>org/apache/activemq/JmsDurableTopicSelectorTest.*</exclude>
-            <exclude>org/apache/activemq/JmsTopicSelectorTest.*</exclude>
-            <exclude>org/apache/activemq/broker/util/PluginBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/broker/SpringTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3841Test.*</exclude>
-            <exclude>org/apache/activemq/transport/discovery/DiscoveryUriTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/ActiveMQSlowConsumerManualTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3405Test.*</exclude>
-            <exclude>org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.*</exclude>
-            <exclude>org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.*</exclude>
-            <exclude>org/apache/activemq/broker/util/TraceBrokerPathPluginTest.*</exclude>
-            <exclude>org/apache/activemq/advisory/DestinationListenerTest.*</exclude>
-            <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/camel/CamelRedeliveryTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3675Test.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3678Test.*</exclude>
-            <exclude>org/apache/activemq/camel/component/JournalRouteTest.*</exclude>
-            <exclude>org/apache/activemq/ProducerFlowControlSendFailTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ3674Test.*</exclude>
-            <exclude>org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.*</exclude>
-            <exclude>org/apache/activemq/transport/stomp/StompTelnetTest.*</exclude>
-            <exclude>org/apache/activemq/network/NetworkConnectionsTest.*</exclude>
-            <exclude>org/apache/activemq/broker/virtual/FilteredQueueTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ1687Test.*</exclude>
-            <exclude>org/apache/activemq/broker/virtual/CompositeTopicTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/QueueWorkerPrefetchTest.*</exclude>
-            <exclude>org/apache/activemq/transport/vm/VMTransportBrokerNameTest.*</exclude>
-            <exclude>org/apache/activemq/broker/DoubleSubscriptionTest.*</exclude>
-            <exclude>org/apache/activemq/ActiveMQInputStreamTest.*</exclude>
-            <exclude>org/apache/activemq/OptimizedAckTest.*</exclude>
-            <exclude>org/apache/activemq/ReconnectWithSameClientIDTest.*</exclude>
-            <exclude>org/apache/activemq/bugs/AMQ2489Test.*</exclude>
-            <exclude>org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.*</exclude>
-            <exclude>org/apache/activemq/util/HttpBlobTest.*</exclude>
-            <exclude>org/apache/activemq/usecases/ConsumeUncompressedCompressedMessageTest.*</exclude>
-            <exclude>org/apache/activemq/broker/region/DestinationRemoveRestartTest.*</exclude>
-            <exclude>org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.*</exclude>
-            <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.*</exclude>
-            <exclude>org/apache/activemq/security/XBeanSecurityWithGuestNoCredentialsOnlyTest.*</exclude>
-            <exclude>org/apache/activemq/store/kahadb/plist/PListTest.*</exclude>
-          </excludes>
+           </systemProperties>
+           <includes>
+             <include>**/*Test.*</include>
+           </includes>
         </configuration>
       </plugin>
 
@@ -1103,116 +621,536 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>slow-tests</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <!-- not ideal to have to duplicate the config but the excludes don't override otherwise -->
-            <executions>
-             <execution>
-              <id>default-test</id>
-              <phase>test</phase>
-              <goals>
-               <goal>test</goal>
-              </goals>
-              <configuration>
-                <forkMode>pertest</forkMode>
-                <childDelegation>false</childDelegation>
-                <useFile>true</useFile>
-                <argLine>${surefire.argLine}</argLine>
-                <useManifestOnlyJar>false</useManifestOnlyJar>
-                <runOrder>alphabetical</runOrder>
-                <systemProperties>
-                  <property>
-                   <name>org.apache.activemq.default.directory.prefix</name>
-                   <value>target/</value>
-                   </property>
-                </systemProperties>
-              <includes>
-                <include>**/*Test.*</include>
-              </includes>
-              <excludes>
-                <exclude>**/perf/SimpleDurableTopicTest.*</exclude>
-                <!-- These tests run too slow to execute as part of the unit tests -->
-                <exclude>**/TransactionNotStartedErrorTest.*</exclude>
-                <exclude>**/DefaultStoreBrokerTest.*</exclude>
-                <exclude>**/TcpTransportBrokerTest.*</exclude>
-                <exclude>**/activeio/*</exclude>
+    <profiles>
+        <profile>
+            <id>activemq.tests-all</id>
+            <activation>
+                <property>
+                    <name>activemq.tests</name>
+                    <value>all</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/DoSTest.*</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>activemq.exclude-broken-tests</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>activemq.tests</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <!-- http://jira.activemq.org/jira/browse/AMQ-626 -->
+                                <exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
+                                <exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
+                                <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
 
-                <!-- These are performance tests so take too long to run -->
-                <exclude>**/perf/*</exclude>
+                                <!-- Multicast and UDP based tests fail on GBuild -->
+                                <exclude>**/PeerTransportTest.*</exclude>
+                                <exclude>**/MulticastTransportTest.*</exclude>
+                                <exclude>**/MulticastNetworkTest.*</exclude>
+                                <exclude>**/UnreliableUdpTransportTest.*</exclude>
+                                <exclude>**/SslTransportBrokerTest.*</exclude>
 
-                <!-- These are load tests so take too long to run -->
-                <exclude>**/load/*</exclude>
+                                <!-- this one is a little flaky and can fail on some platforms randomly -->
+                                <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
+                                <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
+                                <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
 
-                <!-- http://jira.activemq.org/jira/browse/AMQ-626 -->
-                <exclude>**/MultipleTestsWithSpringFactoryBeanTest.*</exclude>
-                <exclude>**/MultipleTestsWithXBeanFactoryBeanTest.*</exclude>
-                <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
+                                <!-- m2 tests failing since move from assembly  -->
+                                <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
+                                <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
 
-                <!--  these seem to fail only in m2 -->
-                <!--<exclude>**/TransactedTopicMasterSlaveTest.*</exclude>-->
+                                <!-- This test only works on machines which have ssh propertly configured -->
+                                <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
 
-                <!-- Multicast and UDP based tests fail on GBuild -->
-                <exclude>**/PeerTransportTest.*</exclude>
-                <exclude>**/MulticastTransportTest.*</exclude>
-                <exclude>**/MulticastNetworkTest.*</exclude>
-                <exclude>**/UnreliableUdpTransportTest.*</exclude>
-                <exclude>**/SslTransportBrokerTest.*</exclude>
+                                <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
+                                <exclude>**/FailoverConsumerTest.*</exclude>
 
-                <!-- this one is a little flaky and can fail on some platforms randomly -->
-                <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
-                <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
-                <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
+                                <!-- The NIO implemenation is not working properly on OS X.. -->
+                                <exclude>**/nio/**</exclude>
+                                <exclude>**/NioQueueSubscriptionTest.*/</exclude>
 
-                <!-- m2 tests failing since move from assembly  -->
-                <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
-                <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
+                                <!-- A test used for memory profiling only. -->
+                                <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
 
-                <!-- This test only works on machines which have ssh propertly configured -->
-                <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
+                                <!-- used just to test potential memory leaks manually -->
+                                <exclude>**/JDBCTestMemory.*</exclude>
 
-                <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
-                <exclude>**/FailoverConsumerTest.*</exclude>
+                                <exclude>**/amq1490/*</exclude>
+                                <exclude>**/archive/*</exclude>
+                                <exclude>**/NetworkFailoverTest.*/**</exclude>
 
-                <!-- The NIO implemenation is not working properly on OS X.. -->
-                <exclude>**/nio/**</exclude>
-                <exclude>**/NioQueueSubscriptionTest.*/</exclude>
+                                <exclude>**/vm/VMTransportBrokerTest.*</exclude>
+                                <exclude>**/broker/MarshallingBrokerTest.*</exclude>
 
-                 <!-- A test used for memory profiling only. -->
-                 <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
+                                <exclude>**/AMQDeadlockTest3.*</exclude>
 
-                 <!-- used just to test potential memory leaks manually -->
-                 <exclude>**/JDBCTestMemory.*</exclude>
+                                <!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
+                                <exclude>**/ProxyConnectorTest.*</exclude>
 
-                 <exclude>**/amq1490/*</exclude>
-                 <exclude>**/archive/*</exclude>
-                 <exclude>**/NetworkFailoverTest.*/**</exclude>
+                                <!-- breaks hudson: disable till we get a chance to give it the time that it needs - http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/ -->
+                                <exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
+                                <exclude>**/DoSTest.*</exclude>
 
-                 <exclude>**/vm/VMTransportBrokerTest.*</exclude>
-                 <exclude>**/broker/MarshallingBrokerTest.*</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>activemq.tests-quick</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/perf/SimpleDurableTopicTest.*</exclude>
+                                <!-- These tests run too slow to execute as part of the unit tests -->
+                                <exclude>**/TransactionNotStartedErrorTest.*</exclude>
+                                <exclude>**/DefaultStoreBrokerTest.*</exclude>
+                                <exclude>**/TcpTransportBrokerTest.*</exclude>
 
+                                <!-- These are performance tests so take too long to run -->
+                                <exclude>**/perf/*</exclude>
 
-                <exclude>**/AMQDeadlockTest3.*</exclude>
+                                <!-- These are load tests so take too long to run -->
+                                <exclude>**/load/*</exclude>
 
-                <!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
-                <exclude>**/ProxyConnectorTest.*</exclude>
+                                <!-- Don't run the openwire encoding tests since the test and impls are code generated -->
+                                <exclude>org/apache/activemq/openwire/v*/**</exclude>
 
-                <!-- breaks hudson: disable till we get a chance to give it the time that it needs - http://hudson.zones.apache.org/hudson/job/ActiveMQ/org.apache.activemq$activemq-core/199/testReport/org.apache.activemq.network/BrokerNetworkWithStuckMessagesTest/testBrokerNetworkWithStuckMessages/ -->
-                <exclude>**/BrokerNetworkWithStuckMessagesTest.*</exclude>
-                <exclude>**/DoSTest.*</exclude>
-                <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.*</exclude>
-            </excludes>
-            </configuration>
-            </execution>
-           </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+                                <!-- this is a list of our slowest tests (slowest on top).. disabled to bring the build down to about 30 min -->
+                                <exclude>org/apache/activemq/camel/TransactedConsumeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/JdbcDurableSubDupTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ1893Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TopicReplicationTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3120Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2149KahaDBTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DispatchMultipleConsumersTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2183Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/UnlimitedEnqueueTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubProcessTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/TempStoreDataCleanupTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2356Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/MemoryUsageCleanupTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2870Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2584Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/virtual/MirroredQueueCorrectMemoryUsageTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ1936Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/SlowConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/MissingDataFileTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/AMQ1925Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3732Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2512Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3567Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2149Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBVersionTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionSelectorTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompNIOSSLLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompSSLLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompNIOLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/TempStorageBlockedBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/NegativeQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverPriorityTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2983Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3140Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/CompositePublishTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/DoubleExpireTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TopicProducerFlowControlTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TempTopicProducerFlowControlTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2314Test.*</exclude>
+                                <exclude>org/apache/activemq/kaha/LoadTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompVirtualTopicTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2439Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverDuplicateTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/ExpiryHogTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/BrowseOverNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.*</exclude>
+                                <exclude>org/apache/kahadb/index/HashIndexTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveShutdownTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.*</exclude>
+                                <exclude>org/apache/kahadb/index/BTreeIndexTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2021Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/SoWriteTimeoutTest.*</exclude>
+                                <exclude>org/apache/activemq/usage/StoreUsageTest.*</exclude>
+                                <exclude>org/apache/activemq/MessageEvictionTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/DurableConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.*</exclude>
+                                <exclude>org/apache/activemq/proxy/ProxyFailoverTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionReactivationTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverComplexClusterTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/QueueDuplicatesTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/console/command/AMQJournalToolTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/VMTransportClosureTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/http/HttpClientReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/InvokeRequestReplyUsingJmsReplyToHeaderTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/AMQ2927Test.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/QueueBridgeXBeanTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/TopicBridgeXBeanTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/TopicBridgeSpringTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/ReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/QueueBridgeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.*</exclude>
+                                <exclude>org/apache/activemq/PerDestinationStoreLimitTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/discovery/MasterSlaveDiscoveryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3445Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/InitalReconnectDelayTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverTransactionTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ClientRebalanceTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/JmsJdbcXATest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/jmx/PurgeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/xbean/XBeanXmlTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/scheduler/JmsSchedulerTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3625Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/store/StorePerDestinationTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3167Test.*</exclude>
+                                <exclude>org/apache/activemq/store/AutoStorePerDestinationTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2982Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/DataFileNotDeletedTest.*</exclude>
+                                <exclude>org/apache/activemq/spring/ParallelXATransactionTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkRestartPlainTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/AMQ2611Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3352Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.*</exclude>
+                                <exclude>org/apache/bugs/AMQ1730Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/ConnectionPerMessageTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/TopicClusterTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/mqtt/MTQQNioTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/mqtt/MQTTTest.*</exclude>
+                                <exclude>org/apache/activemq/ra/FailoverManagedClusterTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/QueueClusterTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ExpiredMessagesTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.*</exclude>
+                                <exclude>org/apache/activemq/network/DuplexNetworkMBeanTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionActivationTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/TopicMasterSlaveTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MessageReroutingTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerTempQueueNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/SoWriteTimeoutClientTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2401Test.*</exclude>
+                                <exclude>org/apache/activemq/advisory/TempQueueMemoryTest.*</exclude>
+                                <exclude>org/apache/activemq/network/FailoverStaticNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableSubscriptionOfflineTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2413Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/ConnectTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/UniquePropertyMessageEvictionStrategyTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.*</exclude>
+                                <exclude>org/apache/activemq/JmsAutoAckListenerTest.*</exclude>
+                                <exclude>org/apache/activemq/advisory/TempDestLoadTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.*</exclude>
+                                <exclude>org/apache/activemq/util/LRUCacheTest.*</exclude>
+                                <exclude>org/apache/activemq/network/SimpleNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/store/RecoverExpiredMessagesTest.*</exclude>
+                                <exclude>org/apache/activemq/JmsClientAckListenerTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3157Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/ConsumerReceiveWithTimeoutTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryExpiryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2832Test.*</exclude>
+                                <exclude>org/apache/activemq/RemoveDestinationTest.*</exclude>
+                                <exclude>org/apache/activemq/network/DuplexNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkBrokerDetachTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/JmsTimeoutTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MessageGroupCloseTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2645Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2764Test.*</exclude>
+                                <exclude>org/apache/kahadb/util/DataByteArrayInputStreamTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverClusterTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3529Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2751Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/DurableUnsubscribeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ConcurrentDestinationCreationTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/StaticNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/StartAndStopBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/util/DataByteArrayInputStreamTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/JdbcXARecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/virtual/VirtualTopicDLQTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ReliableReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3141Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/JournalDurableSubscriptionTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.*</exclude>
+                                <exclude>org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2910Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ1853Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/MessageExpirationReaperTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/JMSDurableTopicNoLocalTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/DestinationGCTest.*</exclude>
+                                <exclude>org/apache/activemq/web/AjaxTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/AdvisoryTopicCleanUpTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ1917Test.*</exclude>
+                                <exclude>org/apache/activemq/console/command/TestPurgeCommand.*</exclude>
+                                <exclude>org/apache/activemq/OnePrefetchAsyncConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2513Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TransientQueueRedeliverTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TopicRedeliverTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/QueueRedeliverTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverTransportBackupsTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MessageGroupDelayedTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompSslAuthTest.*</exclude>
+                                <exclude>org/apache/activemq/QueueConsumerPriorityTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.*</exclude>
+                                <exclude>org/apache/activemq/security/JaasNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3145Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/policy/AbortSlowConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCXACommitExceptionTest.*</exclude>
+                                <exclude>org/apache/kahadb/index/ListIndexTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/JDBCDurableSubscriptionTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.*</exclude>
+                                <exclude>org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3274Test.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/MemoryUsageBlockResumeTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/LargeQueueSparseDeleteTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverUpdateURIsTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/AMQStackOverFlowTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/ActiveMQRouteTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/tcp/InactivityMonitorTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkRemovesSubscriptionsTest.*</exclude>
+                                <exclude>org/apache/activemq/console/command/TestAMQ3410.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/CursorDurableTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompSslTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/http/HttpSpringTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/ActiveMQMessageAuditTest.*</exclude>
+                                <exclude>org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.*</exclude>
+                                <exclude>org/apache/activemq/spring/Spring2XmlNamespacesTest.*</exclude>
+                                <exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude>
+                                <exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude>
+                                <exclude>org/apache/activemq/network/DemandForwardingBridgeFilterTest.*</exclude>
+                                <exclude>org/apache/activemq/test/message/NestedMapMessageTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3454Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2171Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/RedeliveryRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/KahaDBStoreTest.*</exclude>
+                                <exclude>org/apache/activemq/TimeStampTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3324Test.*</exclude>
+                                <exclude>org/apache/activemq/config/ConfigTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/NetworkAsyncStartTest.*</exclude>
+                                <exclude>org/apache/bugs/LoadBalanceTest.*</exclude>
+                                <exclude>org/apache/activemq/kaha/impl/index/hash/HashTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/fanout/FanoutTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ReconnectWithJMXEnabledTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/CraigsBugTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/tcp/SslBrokerServiceTest.*</exclude>
+                                <exclude>org/apache/activemq/test/message/NestedMapAndListPropertyTest.*</exclude>
+                                <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/XARecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/BrokerConfigTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2084Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverRandomTest.*</exclude>
+                                <exclude>org/apache/activemq/console/command/TestAMQ3411.*</exclude>
+                                <exclude>org/apache/activemq/transport/vm/VMTransportWaitForTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/Stomp11Test.*</exclude>
+                                <exclude>org/apache/activemq/xbean/ConnectorXBeanConfigTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/QueueMbeanRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCStoreOrderTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/JMXRemoveQueueThenSendIgnoredTest.*</exclude>
+                                <exclude>org/apache/activemq/ProducerFlowControlTest.*</exclude>
+                                <exclude>org/apache/activemq/MessageListenerRedeliveryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2580Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/spring/ListenerTest.*</exclude>
+                                <exclude>org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/CamelVMTransportRoutingTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/FailoverTransportBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompNIOSSLTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/MessageGroupNewConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompAdvisoryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/amq1095/MessageSelectorTest.*</exclude>
+                                <exclude>org/apache/activemq/web/RestTest.*</exclude>
+                                <exclude>org/apache/activemq/ra/FailoverManagedConnectionTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3436Test.*</exclude>
+                                <exclude>org/apache/activemq/plugin/BrokerStatisticsPluginTest.*</exclude>
+                                <exclude>org/apache/activemq/command/MessageCompressionTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/DlqTest.*</exclude>
+                                <exclude>org/apache/activemq/blob/FilesystemBlobTest.*</exclude>
+                                <exclude>org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.*</exclude>
+                                <exclude>org/apache/activemq/security/LDAPSecurityTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3622Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2200Test.*</exclude>
+                                <exclude>org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2364Test.*</exclude>
+                                <exclude>org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/security/XBeanSslContextTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/xmpp/XmppTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/SetHeaderTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompTest.*</exclude>
+                                <exclude>org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/CamelDestinationExclusiveConsumerTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/AutoExposeQueuesInCamelTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/RecoveryBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompNIOTest.*</exclude>
+                                <exclude>org/apache/activemq/security/SecurityJMXTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2213Test.*</exclude>
+                                <exclude>org/apache/activemq/config/BrokerXmlConfigFromJNDITest.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/JmsSimpleRequestReplyTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/jmx/MBeanTest.*</exclude>
+                                <exclude>org/apache/activemq/JmsSendWithAsyncCallbackTest.*</exclude>
+                                <exclude>org/apache/activemq/pool/ConnectionExpiryEvictsFromPoolTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2616Test.*</exclude>
+                                <exclude>org/apache/activemq/JmsDurableTopicSelectorTest.*</exclude>
+                                <exclude>org/apache/activemq/JmsTopicSelectorTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/util/PluginBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/SpringTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3841Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/discovery/DiscoveryUriTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/ActiveMQSlowConsumerManualTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3405Test.*</exclude>
+                                <exclude>org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.*</exclude>
+                                <exclude>org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/util/TraceBrokerPathPluginTest.*</exclude>
+                                <exclude>org/apache/activemq/advisory/DestinationListenerTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/camel/CamelRedeliveryTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3675Test.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3678Test.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/JournalRouteTest.*</exclude>
+                                <exclude>org/apache/activemq/ProducerFlowControlSendFailTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ3674Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/stomp/StompTelnetTest.*</exclude>
+                                <exclude>org/apache/activemq/network/NetworkConnectionsTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/virtual/FilteredQueueTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ1687Test.*</exclude>
+                                <exclude>org/apache/activemq/broker/virtual/CompositeTopicTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/QueueWorkerPrefetchTest.*</exclude>
+                                <exclude>org/apache/activemq/transport/vm/VMTransportBrokerNameTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/DoubleSubscriptionTest.*</exclude>
+                                <exclude>org/apache/activemq/ActiveMQInputStreamTest.*</exclude>
+                                <exclude>org/apache/activemq/OptimizedAckTest.*</exclude>
+                                <exclude>org/apache/activemq/ReconnectWithSameClientIDTest.*</exclude>
+                                <exclude>org/apache/activemq/bugs/AMQ2489Test.*</exclude>
+                                <exclude>org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.*</exclude>
+                                <exclude>org/apache/activemq/util/HttpBlobTest.*</exclude>
+                                <exclude>org/apache/activemq/usecases/ConsumeUncompressedCompressedMessageTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/region/DestinationRemoveRestartTest.*</exclude>
+                                <exclude>org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.*</exclude>
+                                <exclude>org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.*</exclude>
+                                <exclude>org/apache/activemq/security/XBeanSecurityWithGuestNoCredentialsOnlyTest.*</exclude>
+                                <exclude>org/apache/activemq/store/kahadb/plist/PListTest.*</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     <profile>
       <id>openwire-generate</id>
       <dependencies>
diff --git a/pom.xml b/pom.xml
index d0cd21d8dc..bfe1bbe643 100755
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
 
     <!-- Maven Plugin Version for this Project -->
     <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
-    <maven-surefire-plugin-version>2.12.3</maven-surefire-plugin-version>
+    <maven-surefire-plugin-version>2.10</maven-surefire-plugin-version>
     <maven-antrun-plugin-version>1.3</maven-antrun-plugin-version>
     <maven-assembly-plugin-version>2.3</maven-assembly-plugin-version>
     <maven-release-plugin-version>2.2.1</maven-release-plugin-version>