diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c
index 814b457..49ee2df 100644
--- a/openbsc/tests/sgsn/sgsn_test.c
+++ b/openbsc/tests/sgsn/sgsn_test.c
@@ -376,11 +376,7 @@
 	 * authorization */
 	OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid));
 
-	/* FIXME: If we were authorized, the state should be
-	 * GMM_COMMON_PROC_INIT until the Attach Complete is received, since a
-	 * P-TMSI is included, fix state handling in gprs_gmm.c */
-
-	/* OSMO_ASSERT(ctx->mm_state == GMM_COMMON_PROC_INIT); */
+	OSMO_ASSERT(ctx->mm_state == GMM_COMMON_PROC_INIT);
 
 	/* we expect an attach accept/reject */
 	OSMO_ASSERT(sgsn_tx_counter == 1);