diff --git a/.gitmodules b/.gitmodules
index 90bec11..2f5d250 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "vendor/github.com/o3ma/o3"]
 	path = vendor/github.com/o3ma/o3
 	url = https://github.com/genofire/o3.git
+	branch = fixtests
 [submodule "vendor/gosrc.io/xmpp"]
 	path = vendor/gosrc.io/xmpp
-	url = https://github.com/genofire/go-xmpp.git
-	branch = patch-1
+	url = https://github.com/FluuxIO/go-xmpp.git
diff --git a/vendor/github.com/o3ma/o3 b/vendor/github.com/o3ma/o3
index 6f04471..16684c5 160000
--- a/vendor/github.com/o3ma/o3
+++ b/vendor/github.com/o3ma/o3
@@ -1 +1 @@
-Subproject commit 6f04471a270e0b968bfa499b4d5d6d640141afb9
+Subproject commit 16684c5acfd9abe4d27d52478c7a6c6d5113d29c
diff --git a/vendor/gosrc.io/xmpp b/vendor/gosrc.io/xmpp
index ca13581..6f9808f 160000
--- a/vendor/gosrc.io/xmpp
+++ b/vendor/gosrc.io/xmpp
@@ -1 +1 @@
-Subproject commit ca13581329dd9a42961025a6b8e935b7a59a08de
+Subproject commit 6f9808fe169ff8b3f9361c0e43ef6d8e55aaa41b