diff --git a/src/cxx_linuxlist.h b/src/cxx_linuxlist.h
index d9b28c44..9a74b3fe 100644
--- a/src/cxx_linuxlist.h
+++ b/src/cxx_linuxlist.h
@@ -45,7 +45,7 @@ struct LListHead {
 		return *static_cast<llist_head *>(static_cast<void *>(this));
 	}
 	const llist_head &llist() const {
-		return *static_cast<llist_head *>(static_cast<void *>(this));
+		return *static_cast<const llist_head *>(static_cast<const void *>(this));
 	}
 
 private:
diff --git a/tests/llist/LListTest.cpp b/tests/llist/LListTest.cpp
index 04f741cf..7c4975e8 100644
--- a/tests/llist/LListTest.cpp
+++ b/tests/llist/LListTest.cpp
@@ -48,10 +48,14 @@ static void test_linux_list()
 
 	printf("=== start %s ===\n", __func__);
 
+	OSMO_ASSERT(llist_empty(&elems));
+
 	llist_add_tail(&elem1.list, &elems);
 	llist_add_tail(&elem2.list, &elems);
 	llist_add_tail(&elem3.list, &elems);
 
+	OSMO_ASSERT(!llist_empty(&elems));
+
 	llist_for_each(pos, &elems) {
 		count += 1;
 		printf(" %i -> %s\n", count, pos->entry()->str);