diff --git a/tests/resources-test.c b/tests/resources-test.c
index 59d8beb..76c9eb8 100644
--- a/tests/resources-test.c
+++ b/tests/resources-test.c
@@ -84,6 +84,17 @@ destroy_notify(struct wl_listener *l, void *data)
 {
 	assert(l && data);
 	notify_called = 1;
+
+	/* In real code it's common to free the structure holding the
+	 * listener at this point, but not to remove it from the list.
+	 *
+	 * That's fine since this is a destruction notification and
+	 * it's the last time this signal can fire.  We set these
+	 * to NULL so we can check them later to ensure no write after
+	 * "free" occurred.
+	 */
+	l->link.prev = NULL;
+	l->link.next = NULL;
 }
 
 TEST(destroy_res_tst)
@@ -119,6 +130,8 @@ TEST(destroy_res_tst)
 	assert(destroyed);
 	assert(notify_called); /* check if signal was emitted */
 	assert(wl_client_get_object(client, id) == NULL);
+	assert(destroy_listener.link.prev == NULL);
+	assert(destroy_listener.link.next == NULL);
 
 	res = wl_resource_create(client, &wl_seat_interface, 2, 0);
 	assert(res);
@@ -131,6 +144,8 @@ TEST(destroy_res_tst)
 	wl_client_destroy(client);
 	assert(destroyed);
 	assert(notify_called);
+	assert(destroy_listener.link.prev == NULL);
+	assert(destroy_listener.link.next == NULL);
 
 	wl_display_destroy(display);
 	close(s[1]);