diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700532931..5c1610db3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ emqttd ChangeLog
 
 Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message
 
+Bugfix: fix websocket url in emqttd/priv/www/websocket.html
+
 Improve: issue #136 - $SYS topics result should not include $SYS messages
 
 
diff --git a/tests/org.eclipse.paho.mqtt.testing b/tests/org.eclipse.paho.mqtt.testing
index 17afdf7fb..bdc690db8 160000
--- a/tests/org.eclipse.paho.mqtt.testing
+++ b/tests/org.eclipse.paho.mqtt.testing
@@ -1 +1 @@
-Subproject commit 17afdf7fb8e148f376d63592bbf3dd4ccdf19e84
+Subproject commit bdc690db847cec1c682e604dca571c72ff756305