diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index dca38c4fdb..4de37c559f 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -54,6 +54,7 @@
       '=META-INF.services.org.apache.xbean.spring.http.activemq.apache.org.schema';-noimport:=true
     </activemq.osgi.export>
     <activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
+    <surefire.argLine>-Xmx512M</surefire.argLine>
   </properties>
 
   <dependencies>
@@ -408,7 +409,7 @@
           <forkMode>pertest</forkMode>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
-          <argLine>-Xmx512M</argLine>
+          <argLine>${surefire.argLine}</argLine>
 
            <systemProperties>
             <property>
diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/KahaDBDurableTransactedTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/KahaDBDurableTransactedTopicTest.java
index d75fb9a55a..61b18cb44e 100644
--- a/activemq-core/src/test/java/org/apache/activemq/perf/KahaDBDurableTransactedTopicTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/perf/KahaDBDurableTransactedTopicTest.java
@@ -23,11 +23,11 @@ import javax.jms.JMSException;
 /**
  * @version $Revision: 1.3 $
  */
-public class KahaDBDurableTransactedTopicTest extends SimpleDurableTopicTest {
+public class KahaDBDurableTransactedTopicTest extends KahaDBDurableTopicTest {
 
     @Override
     protected PerfProducer createProducer(ConnectionFactory fac, Destination dest, int number, byte[] payload) throws JMSException {
-        return new PerfProducer(fac, dest, payload);
+        return new PerfProducer(fac, dest, payload, true);
     }
 
   
diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
index 494bb51ed5..fb757c30b8 100644
--- a/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
@@ -33,8 +33,8 @@ public class SimpleDurableTopicTest extends SimpleTopicTest {
     protected void setUp() throws Exception {
         numberOfDestinations=1;
         numberOfConsumers = 2;
-        numberofProducers = 1;
-        sampleCount=1000;
+        numberofProducers = Integer.parseInt(System.getProperty("SimpleDurableTopicTest.numberofProducers", "1"), 10);
+        sampleCount= Integer.parseInt(System.getProperty("SimpleDurableTopicTest.sampleCount", "1000"), 10);
         playloadSize = 1024;
         super.setUp();
     }