diff --git a/.gitmodules b/.gitmodules
index 095a6a5e..34ffd55d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,10 +3,12 @@
 	url = https://github.com/bats-core/bats-core
 [submodule "test_lib/bats-support"]
 	path = test_lib/bats-support
-	url = https://github.com/ztombol/bats-support
+	url = https://github.com/bats-core/bats-support
+	branch = tags/v0.3.0
 [submodule "test_lib/bats-assert"]
 	path = test_lib/bats-assert
-	url = https://github.com/ztombol/bats-assert
+	url = https://github.com/bats-core/bats-assert
+	branch = tags/v2.0.0
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
 	url = https://github.com/ztombol/bats-file
diff --git a/test_lib/bats-assert b/test_lib/bats-assert
index 9f88b420..d750c5a1 160000
--- a/test_lib/bats-assert
+++ b/test_lib/bats-assert
@@ -1 +1 @@
-Subproject commit 9f88b4207da750093baabc4e3f41bf68f0dd3630
+Subproject commit d750c5a1b44bf6fc96726aea76f4621db5fd602f
diff --git a/test_lib/bats-support b/test_lib/bats-support
index 004e7076..24a72e14 160000
--- a/test_lib/bats-support
+++ b/test_lib/bats-support
@@ -1 +1 @@
-Subproject commit 004e707638eedd62e0481e8cdc9223ad471f12ee
+Subproject commit 24a72e14349690bcbf7c151b9d2d1cdd32d36eb1