diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
index fc412ebc2..ff17efd35 100644
--- a/src/main/java/org/java_websocket/client/WebSocketClient.java
+++ b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -266,7 +266,7 @@ public void connect() {
 		if( writeThread != null )
 			throw new IllegalStateException( "WebSocketClient objects are not reuseable" );
 		writeThread = new Thread( this );
-		writeThread.setName( "WebSocketWriteThread-" + writeThread.getId() );
+		writeThread.setName( "WebSocketConnectReadThread-" + writeThread.getId() );
 		writeThread.start();
 	}
 
diff --git a/src/test/java/org/java_websocket/issues/Issue666Test.java b/src/test/java/org/java_websocket/issues/Issue666Test.java
index fa1f9e179..49727bb7b 100644
--- a/src/test/java/org/java_websocket/issues/Issue666Test.java
+++ b/src/test/java/org/java_websocket/issues/Issue666Test.java
@@ -145,7 +145,7 @@ public void onStart() {
 		}
 		for( Thread thread : mapAfter.values() ) {
 			String name = thread.getName();
-			if( !name.equals( "WebSocketTimer" ) && !name.startsWith( "WebSocketWriteThread-" ) ) {
+			if( !name.equals( "WebSocketTimer" ) && !name.startsWith( "WebSocketWriteThread-" ) && !name.startsWith( "WebSocketConnectReadThread-" )) {
 				Assert.fail( "Thread not correctly named! Is: " + name );
 			}
 		}