diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
index 6404fce68..cb84f16e8 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
@@ -99,11 +99,11 @@ public class PacketWriterTest {
                         prematureUnblocked = true;
                     }
                 }
-                catch (SmackException.NotConnectedException e) {
+                catch (InterruptedException | SmackException.NotConnectedException e) {
                     // This is the exception we expect.
                     expectedThreadExceptionReference.set(e);
                 }
-                catch (BrokenBarrierException | InterruptedException e) {
+                catch (BrokenBarrierException e) {
                     unexpectedThreadExceptionReference.set(e);
 
                 }