diff --git a/.gitmodules b/.gitmodules
index 61767a9fb..2d15edfc9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "tests/org.eclipse.paho.mqtt.testing"]
 	path = tests/org.eclipse.paho.mqtt.testing
 	url = git://git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.testing.git
+[submodule "plugins/emqttd_dashboard"]
+	path = plugins/emqttd_dashboard
+	url = https://github.com/emqtt/emqttd_dashboard.git
diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard
new file mode 160000
index 000000000..300bb7445
--- /dev/null
+++ b/plugins/emqttd_dashboard
@@ -0,0 +1 @@
+Subproject commit 300bb74452764ac27c261ae000495791397b2a28
diff --git a/tests/benchmarks/high-mqtt.xml b/tests/benchmarks/high-mqtt.xml
new file mode 100644
index 000000000..56907bb2b
--- /dev/null
+++ b/tests/benchmarks/high-mqtt.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!DOCTYPE tsung SYSTEM "/usr/local/share/tsung/tsung-1.0.dtd">
+<tsung loglevel="error" version="1.0">
+  <!-- Client side setup -->
+  <clients>
+    <client host="loadnode1" weight="1" cpu="8" maxusers="200000">
+      <ip scan="true" value="eth0"/>
+    </client>
+    <client host="loadnode2" weight="1" maxusers="200000" cpu="8">
+      <ip scan="true" value="eth0"/>
+    </client>
+    <client host="loadnode3" weight="1" maxusers="200000" cpu="8">
+      <ip scan="true" value="eth0"/>
+    </client>
+</clients>
+
+  <!-- Server side setup -->
+<servers>
+  <server host="172.16.1.94" port="1883" type="tcp"></server>
+</servers>
+
+
+<load >
+	<arrivalphase phase="1" duration="90" unit="second">
+	    <users maxnumber="270000" arrivalrate="3000" unit="second"/>
+	</arrivalphase>
+	<arrivalphase phase="2" duration="90" unit="second">
+	    <users maxnumber="270000" arrivalrate="3000" unit="second"/>
+	</arrivalphase>
+</load>
+ <options>
+    <option name="ports_range" min="1025" max="65535"/>
+  </options>
+<sessions>
+	<session name="mqtt-example" probability="100" type="ts_mqtt">
+		<request>
+			<mqtt type="connect" clean_start="true" keepalive="10" will_topic="will_topic" will_qos="0" will_msg="will_msg" will_retain="false"></mqtt>
+		</request>
+		<for from="1" to="10" incr="1" var="loops">
+			<request subst="true">
+			<mqtt type="publish" topic="test_topic" qos="0" retained="false">test_message</mqtt>
+			</request>
+		</for>
+		<request>
+			<mqtt type="disconnect"></mqtt>
+		</request>
+	</session>
+	<!--<session name="mqtt-example" probability="0" type="ts_mqtt">
+		<request subst="true">
+			<mqtt type="subscribe" topic="test_topic" qos="1"></mqtt>
+		</request>
+		<request>
+			<mqtt type="waitForMessages" timeout="5"></mqtt>
+		</request>
+		<request subst="true">
+			<mqtt type="unsubscribe" topic="test_topic"></mqtt>
+		</request>
+		<request>
+			<mqtt type="disconnect"></mqtt>
+		</request>
+	</session>-->
+
+</sessions>
+</tsung>
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