diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 659b3f6..1e89cf3 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -3958,23 +3958,26 @@
 	execute( TC_assignment_codec_efr() );
 	execute( TC_assignment_codec_amr_f() );
 	execute( TC_assignment_codec_amr_h() );
-	execute( TC_assignment_codec_amr_f_S1() );
-	execute( TC_assignment_codec_amr_h_S1() );
-	execute( TC_assignment_codec_amr_f_S124() );
-	execute( TC_assignment_codec_amr_h_S124() );
-	execute( TC_assignment_codec_amr_f_S0() );
-	execute( TC_assignment_codec_amr_f_S02() );
-	execute( TC_assignment_codec_amr_f_S024() );
-	execute( TC_assignment_codec_amr_f_S0247() );
-	execute( TC_assignment_codec_amr_h_S0() );
-	execute( TC_assignment_codec_amr_h_S02() );
-	execute( TC_assignment_codec_amr_h_S024() );
-	execute( TC_assignment_codec_amr_h_S0247() );
-	execute( TC_assignment_codec_amr_f_S01234567() );
-	execute( TC_assignment_codec_amr_f_S0234567() );
-	execute( TC_assignment_codec_amr_f_zero() );
-	execute( TC_assignment_codec_amr_f_unsupp() );
-	execute( TC_assignment_codec_amr_h_S7() );
+
+	if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) {
+		execute( TC_assignment_codec_amr_f_S1() );
+		execute( TC_assignment_codec_amr_h_S1() );
+		execute( TC_assignment_codec_amr_f_S124() );
+		execute( TC_assignment_codec_amr_h_S124() );
+		execute( TC_assignment_codec_amr_f_S0() );
+		execute( TC_assignment_codec_amr_f_S02() );
+		execute( TC_assignment_codec_amr_f_S024() );
+		execute( TC_assignment_codec_amr_f_S0247() );
+		execute( TC_assignment_codec_amr_h_S0() );
+		execute( TC_assignment_codec_amr_h_S02() );
+		execute( TC_assignment_codec_amr_h_S024() );
+		execute( TC_assignment_codec_amr_h_S0247() );
+		execute( TC_assignment_codec_amr_f_S01234567() );
+		execute( TC_assignment_codec_amr_f_S0234567() );
+		execute( TC_assignment_codec_amr_f_zero() );
+		execute( TC_assignment_codec_amr_f_unsupp() );
+		execute( TC_assignment_codec_amr_h_S7() );
+	}
 
 	execute( TC_assignment_codec_fr_exhausted_req_hr() );
 	execute( TC_assignment_codec_fr_exhausted_req_fr() );