diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 838b6e1f8..42880610e 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -692,7 +692,6 @@ function f_init_bssgp() runs on bssgp_CT {
 	bssgp_component.start(BssgpStart(mp_gb_cfg));
 
 	f_bssgp_client_register(mmctx.imsi, mmctx.tlli, mp_gb_cfg.cell_id);
-	f_bssgp_establish();
 }
 
 
diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn
index 7e6611d90..15a9cf6de 100644
--- a/pcu/PCU_Tests_RAW.ttcn
+++ b/pcu/PCU_Tests_RAW.ttcn
@@ -422,27 +422,6 @@ testcase TC_ns_so_block() runs on RAW_Test_CT {
 	setverdict(pass);
 }
 
-/* Test component with PCUIF + BSSGP/NS Emulation (no L1CTL) */
-type component bssgp_pcuif_CT extends bssgp_CT, RAW_PCU_CT {
-}
-
-testcase TC_pcuif_suspend() runs on bssgp_pcuif_CT {
-	var OCT6 ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.cell_id.ra_id);
-	var GprsTlli tlli := 'FFFFFFFF'O;
-
-	/* Initialize PCU interface side */
-	f_init_pcuif();
-
-	/* Initialize NS/BSSGP side */
-	f_init_bssgp();
-
-	f_sleep(1.0);
-	f_pcuif_tx(ts_PCUIF_SUSP_REQ(0, tlli, ra_id, 0));
-	BSSGP_SIG[0].receive(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.cell_id.ra_id));
-
-	setverdict(pass);
-}
-
 type component RAW_PCU_Test_CT extends bssgp_CT {
 	/* Connection to the BTS component (one for now) */
 	port RAW_PCU_MSG_PT BTS;
@@ -573,6 +552,33 @@ runs on RAW_PCU_Test_CT return boolean {
 	return false;
 }
 
+testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT {
+	var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.cell_id.ra_id);
+	var GprsTlli tlli := 'FFFFFFFF'O;
+	timer T;
+
+	/* Initialize NS/BSSGP side */
+	f_init_bssgp();
+
+	/* Initialize the PCU interface abstraction */
+	f_init_raw(testcasename());
+
+	/* Establish BSSGP connection to the PCU */
+	f_bssgp_establish();
+
+	BTS.send(ts_PCUIF_SUSP_REQ(0, tlli, ra_id, 0));
+
+	T.start(2.0);
+	alt {
+	[] BSSGP_SIG[0].receive(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.cell_id.ra_id)) {
+		setverdict(pass);
+		}
+	[] T.timeout {
+		setverdict(fail, "Timeout waiting for BSSGP SUSPEND");
+		}
+	}
+}
+
 /* Test of correct Timing Advance at the time of TBF establishment
  * (derived from timing offset of the Access Burst). */
 testcase TC_ta_rach_imm_ass() runs on RAW_PCU_Test_CT {