diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 45c3239..6aefde5 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -6027,6 +6027,32 @@
 	f_verify_encr_info(chan_act);
 	f_chan_act_verify_tsc(chan_act, expect_target_tsc);
 
+	if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.codecList)) {
+		if (not g_pars.aoip) {
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"handoverRequestAck: Expected no Speech Codec List (BSS Supported), because this is not AoIP");
+		}
+		/* TODO: check actual codecs? */
+	} else {
+		if (g_pars.aoip) {
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"handoverRequestAck: Expected Speech Codec List (BSS Supported), but none found");
+		}
+	}
+
+	if (ispresent(rx_bssap.pdu.bssmap.handoverRequestAck.speechCodec)) {
+		if (not g_pars.aoip) {
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"handoverRequestAck: Expected no Speech Codec (Chosen), because this is not AoIP");
+		}
+		/* TODO: check actual codec? */
+	} else {
+		if (g_pars.aoip) {
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"handoverRequestAck: Expected Speech Codec (Chosen), but none found");
+		}
+	}
+
 	ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info;
 	log("Received L3 Info in HO Request Ack: ", ho_command_str);
 	var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str);