diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
index eff719e865..a707cf28f4 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
@@ -63,6 +63,18 @@ public class Stomp11Test extends StompTestSupport {
         connection.start();
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        try {
+            if (connection != null) {
+                connection.close();
+                connection = null;
+            }
+        } catch (Exception ex) {}
+
+        super.tearDown();
+    }
+
     @Test(timeout = 60000)
     public void testConnect() throws Exception {