1 files changed, 9 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
index 14eec8daff..620b2a5161 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
@@ -65,6 +65,15 @@ public class AlertingTest extends AbstractTestLogging
         setupConnection();
     }
 
+    @Override
+    public void tearDown() throws Exception
+    {
+        // Ensure queue is clean for next run.
+        drainQueue(_destination);
+        super.tearDown();
+    }
+
+
     /**
      * Create a new connection and ensure taht our destination queue is created
      * and bound.