diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 0080fe0..880b693 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -237,7 +237,11 @@
 
 	/* Call a function of our 'parent component' BSSAP_Adapter_CT to start the
 	 * MSC-side BSSAP emulation */
-	f_bssap_init("VirtMSC", handler_mode);
+	if (handler_mode) {
+		f_bssap_init("VirtMSC", MSC_BssmapOps);
+	} else {
+		f_bssap_init("VirtMSC", omit);
+	}
 	f_ipa_ctrl_start(ctrl, mp_bsc_ip, mp_bsc_ctrl_port, 0);
 
 	for (i := 0; i < nr_bts; i := i+1) {