diff --git a/.gitmodules b/.gitmodules
index 68230b92edf9..69aa470ea6ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,6 +48,7 @@
 	path = 3rdparty/cmocka
 	url = ../cmocka.git
 	update = none
+	branch = stable-1.1
 [submodule "3rdparty/qc_blobs"]
 	path = 3rdparty/qc_blobs
 	url = ../qc_blobs.git
diff --git a/3rdparty/cmocka b/3rdparty/cmocka
index 672c5cee79eb..8931845c35e7 160000
--- a/3rdparty/cmocka
+++ b/3rdparty/cmocka
@@ -1 +1 @@
-Subproject commit 672c5cee79eb412025c3dd8b034e611c1f119055
+Subproject commit 8931845c35e78b5123d73430b071affd537d5935
diff --git a/tests/lib/b64_decode-test.c b/tests/lib/b64_decode-test.c
index 631dc15f7d0e..189ce9623779 100644
--- a/tests/lib/b64_decode-test.c
+++ b/tests/lib/b64_decode-test.c
@@ -35,7 +35,7 @@ static void test_b64_decode(void **state)
 		res = b64_decode((uint8_t *)messages[i].enc, strlen(messages[i].enc), decoded);
 
 		assert_int_equal(res, (strlen(messages[i].dec)));
-		assert_string_equal(decoded, messages[i].dec);
+		assert_string_equal((const char *)decoded, messages[i].dec);
 
 		free(decoded);
 	}