diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index 926c97c..e1a17ac 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -440,6 +440,7 @@
 					       33);
 	bsc = bsc_connection_alloc(nat);
 	bsc->cfg = bsc_config_alloc(nat, "foo", 2323);
+	bsc->last_endpoint = 0x1a;
 	con.bsc = bsc;
 
 	msg = msgb_alloc(4096, "foo");
@@ -455,11 +456,11 @@
 		abort();
 	}
 
-	if (con.bsc_endp != 1) {
+	if (con.bsc_endp != 0x1b) {
 		fprintf(stderr, "Assigned timeslot should have been 1.\n");
 		abort();
 	}
-	if (con.bsc->endpoint_status[1] != 1) {
+	if (con.bsc->endpoint_status[0x1b] != 1) {
 		fprintf(stderr, "The status on the BSC is wrong.\n");
 		abort();
 	}
@@ -467,7 +468,8 @@
 	talloc_free(parsed);
 
 	bsc_mgcp_dlcx(&con);
-	if (con.bsc_endp != -1 || con.msc_endp != -1 || con.bsc->endpoint_status[1] != 0) {
+	if (con.bsc_endp != -1 || con.msc_endp != -1 ||
+	    con.bsc->endpoint_status[1] != 0 || con.bsc->last_endpoint != 0x1b) {
 		fprintf(stderr, "Clearing should remove the mapping.\n");
 		abort();
 	}