diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index b6d28b1..faf1a6e 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -381,6 +381,29 @@
 	}
 }
 
+/* Test behavior if MSC answers with CREF to CR */
+testcase TC_assignment_cic_only() runs on test_CT {
+	var BSSAP_N_CONNECT_ind rx_c_ind;
+	var RSL_Message rx_rsl;
+	var DchanTuple dt;
+
+	f_init();
+	f_bssap_reset();
+
+	dt := f_est_dchan('23'O, 23, '00000000'O);
+	/* send assignment without AoIP IEs */
+	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(0, 1)));
+	alt {
+	[] BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_AssignmentComplete)) {
+		setverdict(fail, "AoIP BSC cannot accept ASSIGNMENT without AoIP Transport IE");
+		}
+	[] BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_AssignmentFail)) {
+		setverdict(pass);
+		}
+	[] BSSAP.receive { repeat; }
+	}
+}
+
 
 type record DchanTuple {
 	integer sccp_conn_id,
@@ -1087,6 +1110,8 @@
 	execute( TC_chan_rel_hard_rlsd() );
 	execute( TC_chan_rel_a_reset() );
 
+	execute( TC_assignment_cic_only() );
+
 	execute( TC_rll_est_ind_inact_lchan() );
 	execute( TC_rll_est_ind_inval_sapi1() );
 	execute( TC_rll_est_ind_inval_sapi3() );
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 54e3f79..6e7813f 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -368,6 +368,22 @@
 	}
 }
 
+template PDU_BSSAP tr_BSSMAP_AssignmentFail modifies tr_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			assignmentFailure := {
+				messageType := '03'O,	/* overwritten */
+				rR_Cause := *,
+				circuitPool := *,
+				circuitPoolList := *,
+				talkerPriority := *,
+				codecList := *
+			}
+		}
+	}
+}
+
+
 template (value) PDU_BSSAP ts_BSSMAP_ClearCommand(BssmapCause cause)
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {