diff --git a/.gitmodules b/.gitmodules
index 6a170946b4e..eb05693ce21 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,12 @@
 [submodule "tests/lib/bats-core"]
 	path = test/lib/bats-core
-	url = https://github.com/crowdsecurity/bats-core.git
-        branch = v1.7.0
+	url = https://github.com/bats-core/bats-core.git
 [submodule "tests/lib/bats-file"]
 	path = test/lib/bats-file
-	url = https://github.com/crowdsecurity/bats-file.git
+	url = https://github.com/bats-core/bats-file.git
 [submodule "tests/lib/bats-assert"]
 	path = test/lib/bats-assert
-	url = https://github.com/crowdsecurity/bats-assert.git
+	url = https://github.com/bats-core/bats-assert.git
 [submodule "tests/lib/bats-support"]
 	path = test/lib/bats-support
-	url = https://github.com/crowdsecurity/bats-support.git
-[submodule "tests/lib/bats-mock"]
-	path = test/lib/bats-mock
-	url = https://github.com/crowdsecurity/bats-mock.git
+	url = https://github.com/bats-core/bats-support.git
diff --git a/test/README.md b/test/README.md
index a63fc06ddf8..18fb8dc8f85 100644
--- a/test/README.md
+++ b/test/README.md
@@ -111,7 +111,6 @@ we use in this test suite:
 - [bats-assert](https://github.com/bats-core/bats-assert)
 - [bats-support](https://github.com/bats-core/bats-support)
 - [bats-file](https://github.com/bats-core/bats-file)
-- [bats-mock](https://github.com/grayhemp/bats-mock)
 
 # setup and teardown
 
@@ -305,12 +304,6 @@ We included the [bats-file](https://github.com/bats-core/bats-file) plugin to
 check the result of file system operations: existence, type/size/ownership checks
 on files, symlinks, directories, sockets.
 
-## mocking external commands
-
-The [bats-mock](https://github.com/grayhemp/bats-mock) plugin allows you to define
-a "fake" behavior for the external commands called by a package under test, and
-to record and assert which parameters are passed to it.
-
 ## gotchas
 
 - pay attention to tests that are not run - for example "bats warning: Executed 143
diff --git a/test/bats/81_alert_context.bats b/test/bats/81_alert_context.bats
index 3d0b484b00c..fa63e3ff6f2 100644
--- a/test/bats/81_alert_context.bats
+++ b/test/bats/81_alert_context.bats
@@ -30,7 +30,7 @@ teardown() {
 
 #----------
 
-@test "$FILE 1.1.1.172 has context" {
+@test "1.1.1.172 has context" {
     tmpfile=$(TMPDIR="$BATS_TEST_TMPDIR" mktemp)
     touch "$tmpfile"
 
diff --git a/test/lib/bats-assert b/test/lib/bats-assert
index b93143a1bfb..f1e9280eaae 160000
--- a/test/lib/bats-assert
+++ b/test/lib/bats-assert
@@ -1 +1 @@
-Subproject commit b93143a1bfbde41d9b7343aab0d36f3ef6549e6b
+Subproject commit f1e9280eaae8f86cbe278a687e6ba755bc802c1a
diff --git a/test/lib/bats-core b/test/lib/bats-core
index f7defb94362..713504bc022 160000
--- a/test/lib/bats-core
+++ b/test/lib/bats-core
@@ -1 +1 @@
-Subproject commit f7defb94362f2053a3e73d13086a167448ea9133
+Subproject commit 713504bc0224a19b3d7c7958c18dc07f64f54b44
diff --git a/test/lib/bats-file b/test/lib/bats-file
index cb914cdc176..13ad5e2ffcc 160000
--- a/test/lib/bats-file
+++ b/test/lib/bats-file
@@ -1 +1 @@
-Subproject commit cb914cdc176da00e321d3bc92f88383698c701d6
+Subproject commit 13ad5e2ffcc360281432db3d43a306f7b3667d60
diff --git a/test/lib/bats-mock b/test/lib/bats-mock
deleted file mode 160000
index 48fce74482a..00000000000
--- a/test/lib/bats-mock
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 48fce74482a4d2bb879b904ccab31b6bc98e3224
diff --git a/test/lib/bats-support b/test/lib/bats-support
index 3c8fadc5097..24a72e14349 160000
--- a/test/lib/bats-support
+++ b/test/lib/bats-support
@@ -1 +1 @@
-Subproject commit 3c8fadc5097c9acfc96d836dced2bb598e48b009
+Subproject commit 24a72e14349690bcbf7c151b9d2d1cdd32d36eb1