diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 5f8545bcdf..b905db3dc5 100755
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -78,6 +78,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>com.github.stefanbirkner</groupId>
+        <artifactId>system-rules</artifactId>
+        <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
diff --git a/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java b/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java
index a9e207032d..0d63e1e4f5 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/util/DefaultIOExceptionHandlerTest.java
@@ -17,27 +17,43 @@
 
 package org.apache.activemq.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.SuppressReplyException;
+import org.junit.Rule;
 import org.junit.Test;
-
-
-import static org.junit.Assert.*;
+import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.junit.contrib.java.lang.system.internal.NoExitSecurityManager;
 
 public class DefaultIOExceptionHandlerTest {
 
+    @Rule
+    public final ExpectedSystemExit exit = ExpectedSystemExit.none();
+
     DefaultIOExceptionHandler underTest = new DefaultIOExceptionHandler();
 
-    @Test
+    @Test(timeout=20000)
     public void testHandleWithShutdownOnExit() throws Exception {
+        exit.expectSystemExit();
         doTest(true);
+        assertTrue(Wait.waitFor(new Wait.Condition() {
+            @Override
+            public boolean isSatisified() throws Exception {
+                return ((NoExitSecurityManager)System.getSecurityManager()).isCheckExitCalled();
+            }
+        }, 10000));
+
     }
 
-    @Test
+    @Test(timeout=20000)
     public void testHandleWithOutShutdownOnExit() throws Exception {
         doTest(false);
     }
diff --git a/pom.xml b/pom.xml
index f988a3fb61..d26d3329ab 100755
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,7 @@
     <spring-version>4.1.8.RELEASE</spring-version>
     <spring-osgi-version>1.2.1</spring-osgi-version>
     <stax2-api-version>3.0.2</stax2-api-version>
+    <system-rules-version>1.13.0</system-rules-version>
     <velocity-version>1.7</velocity-version>
     <woodstox-core-asl-version>4.2.0</woodstox-core-asl-version>
     <xalan-version>2.7.2</xalan-version>
@@ -995,6 +996,12 @@
         <version>${junit-version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.stefanbirkner</groupId>
+        <artifactId>system-rules</artifactId>
+        <version>${system-rules-version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>