diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index d00c40e..8b10d0e 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -639,7 +639,8 @@
 /* create a new test component */
 friend function f_start_handler(void_fn fn, ConnHdlrPars pars,
 				boolean pcu_comp := false,
-				boolean trxc_comp := false)
+				boolean trxc_comp := false,
+				boolean l1ctl := true)
 runs on test_CT return ConnHdlr {
 	var charstring id := testcasename();
 	var ConnHdlr vc_conn;
@@ -660,6 +661,9 @@
 		unmap(self:BTS_TRXC, system:BTS_TRXC);
 		map(vc_conn:BTS_TRXC, system:BTS_TRXC);
 	}
+	if (l1ctl) {
+		map(vc_conn:L1CTL, system:L1CTL);
+	}
 
 	/* Obtain frequency hopping parameters for a given timeslot */
 	if (mp_freq_hop_enabled and mp_transceiver_num > 1) {
@@ -697,8 +701,9 @@
 	g_pars := pars;
 	g_chan_nr := pars.chan_nr;
 
-	map(self:L1CTL, system:L1CTL);
-	f_connect_reset(L1CTL);
+	if (L1CTL.checkstate("Mapped")) {
+		f_connect_reset(L1CTL);
+	}
 
 	if (mp_bts_trxc_port != -1 and BTS_TRXC.checkstate("Mapped")) {
 		f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);