diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index d926ad8..4bab055 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -619,6 +619,7 @@
 		sio := '83'O,
 		rctx := 6
 	};
+	boolean mp_enable_lcs_tests := true;
 
 	/* Whether to enable osmux tests. Can be dropped completely and enable
 	   unconditionally once new version of osmo-bsc is released (current
@@ -1081,13 +1082,15 @@
 		}
 	}
 
-	if (handler_mode) {
-		f_bssap_le_adapter_init(g_bssap_le, mp_bssap_le_cfg, "VirtSMLC", SMLC_BssapLeOps);
-	} else {
-		f_bssap_le_adapter_init(g_bssap_le, mp_bssap_le_cfg, "VirtSMLC", omit);
-		connect(self:BSSAP_LE, g_bssap_le.vc_SCCP:SCCP_SP_PORT);
+	if (mp_enable_lcs_tests) {
+		if (handler_mode) {
+			f_bssap_le_adapter_init(g_bssap_le, mp_bssap_le_cfg, "VirtSMLC", SMLC_BssapLeOps);
+		} else {
+			f_bssap_le_adapter_init(g_bssap_le, mp_bssap_le_cfg, "VirtSMLC", omit);
+			connect(self:BSSAP_LE, g_bssap_le.vc_SCCP:SCCP_SP_PORT);
+		}
+		f_bssap_le_adapter_start(g_bssap_le);
 	}
-	f_bssap_le_adapter_start(g_bssap_le);
 
 	/* start the test with exactly all enabled MSCs allowed to attach */
 	f_vty_msc_allow_attach(BSCVTY, allow_attach);
@@ -3139,8 +3142,10 @@
 		connect(vc_conn:RSL2_PROC, bts[2].rsl.vc_RSL:RSL_PROC);
 	}
 	connect(vc_conn:BSSAP, g_bssap[bssap_idx].vc_RAN:CLIENT);
-	connect(vc_conn:BSSAP_LE, g_bssap_le.vc_BSSAP_LE:CLIENT);
-	connect(vc_conn:BSSAP_LE_PROC, g_bssap_le.vc_BSSAP_LE:PROC);
+	if (mp_enable_lcs_tests) {
+		connect(vc_conn:BSSAP_LE, g_bssap_le.vc_BSSAP_LE:CLIENT);
+		connect(vc_conn:BSSAP_LE_PROC, g_bssap_le.vc_BSSAP_LE:PROC);
+	}
 	connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
 	connect(vc_conn:MGCP_MULTI, vc_MGCP:MGCP_CLIENT_MULTI);
 	connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC);