diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
index 1991d6a68b1..19ec28ddd06 100644
--- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
@@ -55,6 +55,7 @@ CREATE_FLAG(flag_pa_sync_lost);
 CREATE_FLAG(flag_pa_request);
 CREATE_FLAG(flag_bis_sync_requested);
 CREATE_FLAG(flag_base_metadata_updated);
+CREATE_FLAG(flag_unicast_stream_configured);
 
 static struct bt_bap_broadcast_sink *g_broadcast_sink;
 static struct bt_le_scan_recv_info broadcaster_info;
@@ -62,14 +63,6 @@ static bt_addr_le_t broadcaster_addr;
 static struct bt_le_per_adv_sync *pa_sync;
 static uint32_t broadcaster_broadcast_id;
 static struct audio_test_stream broadcast_sink_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
-static struct bt_le_ext_adv *ext_adv;
-static uint32_t requested_bis_sync;
-static const struct bt_bap_scan_delegator_recv_state *req_recv_state;
-
-static const struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP_LC3(
-	BT_AUDIO_CODEC_CAP_FREQ_ANY, BT_AUDIO_CODEC_CAP_DURATION_ANY,
-	BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1, 2), 30, 240, 2,
-	(BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA));
 
 static const struct bt_audio_codec_qos_pref unicast_qos_pref =
 	BT_AUDIO_CODEC_QOS_PREF(true, BT_GAP_LE_PHY_2M, 0u, 60u, 20000u, 40000u, 20000u, 40000u);
@@ -79,11 +72,6 @@ static bool auto_start_sink_streams;
 static K_SEM_DEFINE(sem_broadcast_started, 0U, ARRAY_SIZE(broadcast_sink_streams));
 static K_SEM_DEFINE(sem_broadcast_stopped, 0U, ARRAY_SIZE(broadcast_sink_streams));
 
-/* Create a mask for the maximum BIS we can sync to using the number of
- * broadcast_sink_streams we have. We add an additional 1 since the bis indexes
- * start from 1 and not 0.
- */
-static const uint32_t bis_index_mask = BIT_MASK(ARRAY_SIZE(broadcast_sink_streams) + 1U);
 static uint32_t bis_index_bitfield;
 
 #define UNICAST_CHANNEL_COUNT_1 BIT(0)
@@ -91,8 +79,6 @@ static uint32_t bis_index_bitfield;
 static struct bt_cap_stream unicast_streams[CONFIG_BT_ASCS_ASE_SNK_COUNT +
 					    CONFIG_BT_ASCS_ASE_SRC_COUNT];
 
-CREATE_FLAG(flag_unicast_stream_configured);
-
 static bool subgroup_data_func_cb(struct bt_data *data, void *user_data)
 {
 	bool *stream_context_found = (bool *)user_data;
@@ -153,6 +139,11 @@ static bool valid_subgroup_metadata_cb(const struct bt_bap_base_subgroup *subgro
 static void base_recv_cb(struct bt_bap_broadcast_sink *sink, const struct bt_bap_base *base,
 			 size_t base_size)
 {
+	/* Create a mask for the maximum BIS we can sync to using the number of
+	 * broadcast_sink_streams we have. We add an additional 1 since the bis indexes
+	 * start from 1 and not 0.
+	 */
+	const uint32_t bis_index_mask = BIT_MASK(ARRAY_SIZE(broadcast_sink_streams) + 1U);
 	uint32_t base_bis_index_bitfield = 0U;
 	int ret;
 
@@ -384,10 +375,9 @@ static int pa_sync_req_cb(struct bt_conn *conn,
 	}
 
 	printk("Sync request\n");
-	req_recv_state = recv_state;
 
-	bt_addr_le_copy(&broadcaster_addr, &req_recv_state->addr);
-	broadcaster_info.sid = req_recv_state->adv_sid;
+	bt_addr_le_copy(&broadcaster_addr, &recv_state->addr);
+	broadcaster_info.sid = recv_state->adv_sid;
 	broadcaster_info.interval = pa_interval;
 
 	SET_FLAG(flag_pa_request);
@@ -402,8 +392,6 @@ static int pa_sync_term_req_cb(struct bt_conn *conn,
 		return -EALREADY;
 	}
 
-	req_recv_state = recv_state;
-
 	UNSET_FLAG(flag_pa_request);
 
 	return 0;
@@ -414,7 +402,6 @@ static int bis_sync_req_cb(struct bt_conn *conn,
 			   const uint32_t bis_sync_req[CONFIG_BT_BAP_BASS_MAX_SUBGROUPS])
 {
 	/* We only care about a single subgroup in this test */
-	requested_bis_sync = bis_sync_req[0];
 	broadcaster_broadcast_id = recv_state->broadcast_id;
 	if (bis_sync_req[0] != 0) {
 		SET_FLAG(flag_bis_sync_requested);
@@ -431,8 +418,6 @@ static void broadcast_code_cb(struct bt_conn *conn,
 {
 	printk("Broadcast code received for %p\n", recv_state);
 
-	req_recv_state = recv_state;
-
 	SET_FLAG(flag_broadcast_code);
 }
 
@@ -645,6 +630,7 @@ static int set_supported_contexts(void)
 void test_start_adv(void)
 {
 	int err;
+	struct bt_le_ext_adv *ext_adv;
 
 	/* Create a connectable non-scannable advertising set */
 	err = bt_le_ext_adv_create(BT_LE_ADV_CONN_ONE_TIME, NULL, &ext_adv);
@@ -700,7 +686,10 @@ static void init(void)
 		.sirk = { 0xcd, 0xcc, 0x72, 0xdd, 0x86, 0x8c, 0xcd, 0xce,
 			  0x22, 0xfd, 0xa1, 0x21, 0x09, 0x7d, 0x7d, 0x45 },
 	};
-
+	static const struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP_LC3(
+		BT_AUDIO_CODEC_CAP_FREQ_ANY, BT_AUDIO_CODEC_CAP_DURATION_ANY,
+		BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1, 2), 30, 240, 2,
+		(BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA));
 	int err;
 
 	err = bt_enable(NULL);