diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index caf4c661a..6141f6ac7 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -713,6 +713,18 @@ runs on BSSGP_ConnHdlr {
 
 	/* call the user-supplied test case function */
 	fn.apply(id);
+
+	for (i := 0; i < NUM_SGSN; i := i+1) {
+		if (SGSN_PROC[i].checkstate("Connected")) {
+			f_client_unregister(g_pars.imsi, SGSN_PROC[i])
+		}
+	}
+
+	for (i := 0; i < NUM_PCU; i := i+1) {
+		if (PCU_PROC[i].checkstate("Connected")) {
+			f_client_unregister(g_pars.imsi, PCU_PROC[i])
+		}
+	}
 }
 
 private function f_client_register(hexstring imsi, OCT4 tlli, BSSGP_PROC_PT PT)