diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
index 4d1a9b17fb..14aeeaa30b 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
@@ -107,8 +107,8 @@ public class DurableTopicSubscription extends PrefetchSubscription {
                 pending.addFirst(node);
             } else {
                 node.decrementReferenceCount();
-                iter.remove();
             }
+            iter.remove();
         }
         
         if( !keepDurableSubsActive ) {
diff --git a/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
index 174625557b..560dacfb3d 100755
--- a/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
@@ -32,15 +32,14 @@ public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest {
         durable = true;
         super.setUp();
     }
-
-
+    
     /**
      * Sends and consumes the messages.
      *
      * @throws Exception
      */
     public void testRedeliverNewSession() throws Exception {
-        String text = "TEST";
+        String text = "TEST: "+System.currentTimeMillis();
         Message sendMessage = session.createTextMessage(text);
 
         if (verbose) {
@@ -74,6 +73,6 @@ public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest {
 
         consumeSession = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         consumer = createConsumer();
-        assertNull(consumer.receiveNoWait());
+        assertNull(consumer.receive(1000));
     }
 }