diff --git a/tests/bluetooth/audio/bap_base/CMakeLists.txt b/tests/bluetooth/audio/bap_base/CMakeLists.txt
index b4f16d6cc355..5dbb837d0863 100644
--- a/tests/bluetooth/audio/bap_base/CMakeLists.txt
+++ b/tests/bluetooth/audio/bap_base/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr COMPONENTS unittest HINTS $ENV{ZEPHYR_BASE})
 
-project(bluetooth_codec)
+project(bluetooth_bap_base)
 
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/audio/bap_base/uut uut)
 
diff --git a/tests/bluetooth/audio/bap_base/src/main.c b/tests/bluetooth/audio/bap_base/src/main.c
index 6ab7f4fc42f6..f453b1c16b66 100644
--- a/tests/bluetooth/audio/bap_base/src/main.c
+++ b/tests/bluetooth/audio/bap_base/src/main.c
@@ -357,7 +357,8 @@ ZTEST_F(bap_base_test_suite, test_base_get_subgroup_codec_id_inval_param_null)
 
 	zassert_not_null(base);
 
-	ret = bt_bap_base_foreach_subgroup(base, test_base_get_subgroup_codec_id_cb, NULL);
+	ret = bt_bap_base_foreach_subgroup(
+		base, test_base_get_subgroup_codec_id_inval_param_null_cb, NULL);
 	zassert_equal(ret, 0, "Unexpected return value: %d", ret);
 }
 
@@ -432,7 +433,8 @@ ZTEST_F(bap_base_test_suite, test_base_get_subgroup_codec_data_inval_param_null)
 
 	zassert_not_null(base);
 
-	ret = bt_bap_base_foreach_subgroup(base, test_base_get_subgroup_codec_data_cb, NULL);
+	ret = bt_bap_base_foreach_subgroup(
+		base, test_base_get_subgroup_codec_data_inval_param_null_cb, NULL);
 	zassert_equal(ret, 0, "Unexpected return value: %d", ret);
 }
 
@@ -504,7 +506,8 @@ ZTEST_F(bap_base_test_suite, test_base_get_subgroup_codec_meta_inval_param_null)
 
 	zassert_not_null(base);
 
-	ret = bt_bap_base_foreach_subgroup(base, test_base_get_subgroup_codec_meta_cb, NULL);
+	ret = bt_bap_base_foreach_subgroup(
+		base, test_base_get_subgroup_codec_meta_inval_param_null_cb, NULL);
 	zassert_equal(ret, 0, "Unexpected return value: %d", ret);
 }
 
@@ -582,7 +585,8 @@ ZTEST_F(bap_base_test_suite, test_base_subgroup_codec_to_codec_cfg_inval_param_n
 
 	zassert_not_null(base);
 
-	ret = bt_bap_base_foreach_subgroup(base, test_base_subgroup_codec_to_codec_cfg_cb, NULL);
+	ret = bt_bap_base_foreach_subgroup(
+		base, test_base_subgroup_codec_to_codec_cfg_inval_param_null_cb, NULL);
 	zassert_equal(ret, 0, "Unexpected return value: %d", ret);
 }
 
@@ -649,7 +653,6 @@ test_bt_bap_base_subgroup_get_bis_indexes_cb(const struct bt_bap_base_subgroup *
 ZTEST_F(bap_base_test_suite, test_bt_bap_base_subgroup_get_bis_indexes)
 {
 	const struct bt_bap_base *base = bt_bap_base_get_base_from_ad(&fixture->valid_base_ad);
-	uint32_t bis_indexes;
 	int ret;
 
 	zassert_not_null(base);