diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..61767a9fb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[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
diff --git a/tests/benchmarks/.placeholder b/tests/benchmarks/.placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/org.eclipse.paho.mqtt.testing b/tests/org.eclipse.paho.mqtt.testing
new file mode 160000
index 000000000..17afdf7fb
--- /dev/null
+++ b/tests/org.eclipse.paho.mqtt.testing
@@ -0,0 +1 @@
+Subproject commit 17afdf7fb8e148f376d63592bbf3dd4ccdf19e84