diff --git a/src/test/java/org/java_websocket/client/ConnectBlockingTest.java b/src/test/java/org/java_websocket/client/ConnectBlockingTest.java
new file mode 100644
index 00000000..fa7797cd
--- /dev/null
+++ b/src/test/java/org/java_websocket/client/ConnectBlockingTest.java
@@ -0,0 +1,68 @@
+package org.java_websocket.client;
+
+import java.io.IOException;
+import java.net.*;
+import java.util.Set;
+import java.util.concurrent.*;
+import org.java_websocket.WebSocket;
+import org.java_websocket.handshake.*;
+import org.java_websocket.client.*;
+import org.java_websocket.server.WebSocketServer;
+import org.java_websocket.util.SocketUtil;
+import org.java_websocket.enums.ReadyState;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ConnectBlockingTest {
+
+  @Test(timeout = 1000)
+  public void test_ConnectBlockingCleanup() throws Throwable {
+
+    Set<Thread> threadSet1 = Thread.getAllStackTraces().keySet();
+    final CountDownLatch ready = new CountDownLatch(1);
+    final CountDownLatch accepted = new CountDownLatch(1);
+
+    final int port = SocketUtil.getAvailablePort();
+
+    /* TCP server which listens to a port, but does not answer handshake */
+    Thread server = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          ServerSocket serverSocket = new ServerSocket(port);
+          ready.countDown();
+          Socket clientSocket = serverSocket.accept();
+          accepted.countDown();
+        } catch (Throwable t) {
+          assertTrue(t instanceof InterruptedException);
+        }
+      }
+    });
+    server.start();
+    ready.await();
+
+    WebSocketClient client = new WebSocketClient(URI.create("ws://localhost:" + port)) {
+      @Override
+      public void onOpen(ServerHandshake handshake) {
+      }
+      @Override
+      public void onClose(int code, String reason, boolean remote) {}
+      @Override
+      public void onMessage(String message) {}
+      @Override
+      public void onError(Exception ex) {
+        ex.printStackTrace();
+      }
+    };
+    boolean connected = client.connectBlocking(100, TimeUnit.MILLISECONDS);
+    assertEquals("TCP socket should have been accepted", 0, accepted.getCount());
+    assertFalse("WebSocket should not be connected (as server didn't send handshake)", connected);
+
+    server.interrupt();
+    server.join();
+
+    Set<Thread> threadSet2 = Thread.getAllStackTraces().keySet();
+    assertEquals("no threads left over", threadSet1, threadSet2);
+    assertTrue("WebSocket is in closed state", client.getReadyState() == ReadyState.CLOSED || client.getReadyState() == ReadyState.NOT_YET_CONNECTED);
+  }
+}