diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 67fbd5090..497ff808b 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -139,6 +139,8 @@ private function f_cbsp_init_server(uint16_t cbsp_msg_id, uint16_t cbsp_ser_no,
 	g_cbsp_msg_id := cbsp_msg_id;
 	g_cbsp_ser_no := cbsp_ser_no;
 	log("g_cbsp_msg_id=", g_cbsp_msg_id, "  g_cbsp_ser_no=", g_cbsp_ser_no);
+
+	f_cbsp_reset_bss(0);
 }
 private function f_expect_cbsp_restart() runs on cbsp_test_CT {
 	interleave {
@@ -161,7 +163,12 @@ function f_gen_page(integer payload_len := 0) return CBSP_IE {
 	return valueof(ts_CbspMsgContent(payload, payload_len));
 }
 
-function f_cbsp_reset_bss(integer idx) runs on CBSP_Adapter_CT {
+function f_cbsp_reset_bss(integer idx) runs on cbsp_test_CT {
+	/* Make sure no CBSP ETWS commands from a previous CBSP test remain in the RSL queue */
+	IPA_RSL[0].clear;
+	IPA_RSL[1].clear;
+	IPA_RSL[2].clear;
+
 	var template (value) CBSP_PDU tx;
 	timer T := 3.0;
 	tx := ts_CBSP_RESET(cell_list := ts_BSSMAP_CIL_BSS);