1 files changed, 11 insertions, 7 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
index 91ed9766f6..95808e454f 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
@@ -196,13 +196,17 @@ public class FlowControlTest extends QpidTestCase
         {
             System.err.println("Test Run:" + ++run);
             Thread.sleep(1000);
-
-            test.startBroker();
-            test.testBasicBytesFlowControl();
-
-            Thread.sleep(1000);
-            
-            test.stopBroker();
+            try
+            {
+                test.startBroker();
+                test.testBasicBytesFlowControl();
+
+                Thread.sleep(1000);
+            }
+            finally
+            {
+                test.stopBroker();
+            }
         }
     }
 }