diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c
index b0ef69f..30a81cb 100644
--- a/openbsc/src/libmgcp/mgcp_osmux.c
+++ b/openbsc/src/libmgcp/mgcp_osmux.c
@@ -536,7 +536,7 @@
 {
 	int i, j, used = 0;
 
-	for (i = 0; i < sizeof(osmux_cid_bitmap) / 8; i++) {
+	for (i = 0; i < sizeof(osmux_cid_bitmap); i++) {
 		for (j = 0; j < 8; j++) {
 			if (osmux_cid_bitmap[i] & (1 << j))
 				used += 1;
@@ -550,7 +550,7 @@
 {
 	int i, j;
 
-	for (i = 0; i < sizeof(osmux_cid_bitmap) / 8; i++) {
+	for (i = 0; i < sizeof(osmux_cid_bitmap); i++) {
 		for (j = 0; j < 8; j++) {
 			if (osmux_cid_bitmap[i] & (1 << j))
 				continue;
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c
index 7b5de31..ec86c55 100644
--- a/openbsc/tests/mgcp/mgcp_test.c
+++ b/openbsc/tests/mgcp/mgcp_test.c
@@ -1186,7 +1186,7 @@
 	osmux_put_cid(id);
 	OSMO_ASSERT(osmux_used_cid() == 0);
 
-	for (i = 0; i < 16; ++i) {
+	for (i = 0; i < 128; ++i) {
 		id = osmux_get_cid();
 		OSMO_ASSERT(id == i);
 		OSMO_ASSERT(osmux_used_cid() == i + 1);