diff --git a/tests/unit/list.c b/tests/unit/list.c
index 2a1c98b24..56a90ea22 100644
--- a/tests/unit/list.c
+++ b/tests/unit/list.c
@@ -129,9 +129,9 @@ Test(list, basics)
 		list_push(&l, (void *) i);
 	}
 
-	cr_assert_eq(list_at(&l, 555), NULL);
+	cr_assert_eq(list_at_safe(&l, 555), NULL);
 	cr_assert_eq(list_last(&l), (void *) 99);
-	cr_assert_eq(list_first(&l), NULL);
+	cr_assert_eq(list_first(&l), (void *) 0);
 
 	for (size_t j = 0, i = 0; j < list_length(&l); j++) {
 		void *k = list_at(&l, j);