diff --git a/msc_tests/BSC_ConnectionHandler.ttcn b/msc_tests/BSC_ConnectionHandler.ttcn
index a404ed3..402448e 100644
--- a/msc_tests/BSC_ConnectionHandler.ttcn
+++ b/msc_tests/BSC_ConnectionHandler.ttcn
@@ -29,7 +29,9 @@
 	SCCP_PAR_Address sccp_addr_peer,
 	BSSMAP_IE_CellIdentifier cell_id,
 	hexstring imsi,
-	hexstring msisdn
+	hexstring msisdn,
+	BSSMAP_IE_ClassmarkInformationType2 cm2,
+	BSSMAP_IE_ClassmarkInformationType3 cm3 optional
 };
 
 
@@ -142,7 +144,7 @@
 	/* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
 	f_bssap_compl_l3(l3_lu);
 
-	BSSAP.send(ts_BSSMAP_ClassmarkUpd);
+	BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));
 
 	if (expect_auth) {
 		/* FIXME */
diff --git a/msc_tests/MSC_Tests.ttcn b/msc_tests/MSC_Tests.ttcn
index e336e9a..0acfdb2 100644
--- a/msc_tests/MSC_Tests.ttcn
+++ b/msc_tests/MSC_Tests.ttcn
@@ -308,7 +308,9 @@
 		sccp_addr_peer := g_sccp_addr_peer,
 		cell_id := valueof(ts_CellId_CGI('262'H, '042'H, 23, 42)),
 		imsi := f_gen_imsi('26242'H, imsi_suffix),
-		msisdn := f_gen_msisdn('491239999'H, imsi_suffix)
+		msisdn := f_gen_msisdn('491239999'H, imsi_suffix),
+		cm2 := valueof(ts_CM2_default),
+		cm3 := omit
 	};
 
 	vc_conn := BSC_ConnHdlr.create(id);