diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
new file mode 100644
index 0000000000..0d9210494a
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
@@ -0,0 +1,125 @@
+package org.apache.activemq.bugs;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.DestinationViewMBean;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test to determine if expired messages are being reaped if there is
+ * no active consumer connected to the broker. 
+ * 
+ * @author bsnyder
+ *
+ */
+public class MessageExpirationReaperTest {
+    
+    protected BrokerService broker; 
+    protected ConnectionFactory factory;
+    protected ActiveMQConnection connection;
+    protected String destinationName = "TEST.Q";
+    protected String brokerUrl = "tcp://localhost:61616";
+    protected String brokerName = "testBroker";
+    
+    @Before
+    public void init() throws Exception {
+        createBroker();
+        
+        factory = createConnectionFactory();
+        connection = (ActiveMQConnection) factory.createConnection();
+        connection.start();
+    }
+    
+    @After
+    public void cleanUp() throws Exception {
+        connection.close();
+        broker.stop();
+    }
+    
+    protected void createBroker() throws Exception {
+        broker = new BrokerService();
+//        broker.setPersistent(false);
+//        broker.setUseJmx(true);
+        broker.setBrokerName(brokerName);
+        broker.addConnector(brokerUrl);
+        broker.start();
+    }
+    
+    protected ConnectionFactory createConnectionFactory() throws Exception {
+        return new ActiveMQConnectionFactory(brokerUrl);
+    }
+    
+    protected Session createSession() throws Exception {
+        return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);  
+    }
+    
+    @Test
+    public void testExpiredMessageReaping() throws Exception {
+        
+        Session producerSession = createSession();
+        ActiveMQDestination destination =  (ActiveMQDestination) producerSession.createQueue(destinationName);
+        MessageProducer producer = producerSession.createProducer(destination);
+        producer.setTimeToLive(1000);
+        
+        final int count = 3;
+        // Send some messages with an expiration 
+        for (int i = 0; i < count; i++) {
+            TextMessage message = producerSession.createTextMessage("" + i);
+            producer.send(message);
+        }
+        
+        // Let the messages expire 
+        Thread.sleep(1000);
+        
+        DestinationViewMBean view = createView(destination);
+        
+        /*################### CURRENT EXPECTED FAILURE ####################*/ 
+        // The messages expire and should be reaped but they're not currently 
+        // reaped until there is an active consumer placed on the queue 
+        assertEquals("Incorrect count: " + view.getInFlightCount(), 0, view.getInFlightCount());
+        
+        
+        // Send more messages with an expiration 
+        for (int i = 0; i < count; i++) {
+            TextMessage message = producerSession.createTextMessage("" + i);
+            producer.send(message);
+        }
+        
+        // Simply browse the queue 
+        Session browserSession = createSession();
+        QueueBrowser browser = browserSession.createBrowser((Queue) destination);
+        browser.getEnumeration(); 
+        
+        // The messages expire and should be reaped because of the presence of 
+        // the queue browser 
+        assertEquals("Wrong inFlightCount: " + view.getInFlightCount(), 0, view.getInFlightCount());
+    }
+    
+    protected DestinationViewMBean createView(ActiveMQDestination destination) throws Exception {
+        MBeanServer mbeanServer = broker.getManagementContext().getMBeanServer();
+        String domain = "org.apache.activemq";
+        ObjectName name;
+        if (destination.isQueue()) {
+            name = new ObjectName(domain + ":BrokerName=" + brokerName + ",Type=Queue,Destination=" + destinationName);
+        } else {
+            name = new ObjectName(domain + ":BrokerName=" + brokerName + ",Type=Topic,Destination=" + destinationName);
+        }
+        return (DestinationViewMBean)MBeanServerInvocationHandler.newProxyInstance(mbeanServer, name, DestinationViewMBean.class, true);
+    }
+}