diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp
index 3d58f50..3b75763 100644
--- a/tests/alloc/AllocTest.cpp
+++ b/tests/alloc/AllocTest.cpp
@@ -33,7 +33,6 @@
 
 /* globals used by the code */
 void *tall_pcu_ctx;
-struct gprs_rlcmac_bts *gprs_rlcmac_bts;
 int16_t spoof_mnc = 0, spoof_mcc = 0;
 
 static void test_alloc_a(gprs_rlcmac_tbf_direction dir, const int count)
@@ -47,7 +46,6 @@
 
 	memset(&bts, 0, sizeof(bts));
 	bts.alloc_algorithm = alloc_algorithm_a;
-	gprs_rlcmac_bts = &bts;
 
 	struct gprs_rlcmac_trx *trx = &bts.trx[0];
 	trx->pdch[2].enable = 1;
diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp
index 4b58a8b..ed0abbe 100644
--- a/tests/emu/pcu_emu.cpp
+++ b/tests/emu/pcu_emu.cpp
@@ -39,7 +39,6 @@
 
 /* Extern data to please the underlying code */
 void *tall_pcu_ctx;
-struct gprs_rlcmac_bts *gprs_rlcmac_bts;
 int16_t spoof_mnc = 0, spoof_mcc = 0;
 
 extern void test_replay_gprs_attach(struct gprs_bssgp_pcu *pcu);
@@ -63,13 +62,9 @@
 			test_pdp_activation_data),
 };
 
-struct gprs_rlcmac_bts *create_bts()
+static void init_main_bts()
 {
-	struct gprs_rlcmac_bts *bts;
-
-	bts = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_bts);
-	if (!bts)
-		return NULL;
+	struct gprs_rlcmac_bts *bts = bts_main_data();
 	bts->fc_interval = 100;
 	bts->initial_cs_dl = bts->initial_cs_ul = 1;
 	bts->cs1 = 1;
@@ -85,8 +80,6 @@
 
 	if (!bts->alloc_algorithm)
 		bts->alloc_algorithm = alloc_algorithm_b;
-
-	return bts;
 }
 
 static void bvci_unblocked(struct gprs_bssgp_pcu *pcu)
@@ -124,11 +117,8 @@
 	vty_init(&pcu_vty_info);
 	pcu_vty_init(&gprs_log_info);
 
-	gprs_rlcmac_bts = create_bts();
-	if (!gprs_rlcmac_bts)
-		abort();
-
-	create_and_connect_bssgp(gprs_rlcmac_bts, INADDR_LOOPBACK, 23000);
+	init_main_bts();
+	create_and_connect_bssgp(bts_main_data(), INADDR_LOOPBACK, 23000);
 	
 	for (;;)
 		osmo_select_main(0);