diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 95b7625..2534cf6 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1737,11 +1737,13 @@
 	var template PDU_BSSAP exp_compl := f_gen_exp_compl();
 
 	/* puzzle together the ASSIGNMENT REQ for given codec[s] */
-	ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list;
+	if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) {
+		ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list;
+		exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] :=
+								g_pars.ass_codec_list.codecElements[0];
+	}
 	ass_cmd.pdu.bssmap.assignmentRequest.channelType :=
 				f_BSSMAP_chtype_from_codec(g_pars.ass_codec_list.codecElements[0]);
-	exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] :=
-							g_pars.ass_codec_list.codecElements[0];
 	log("expecting ASS COMPL like this: ", exp_compl);
 
 	f_establish_fully(ass_cmd, exp_compl);