diff --git a/core/sched.c b/core/sched.c
index 236c58e764..2aa96d54e9 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -252,7 +252,7 @@ static inline __attribute__((always_inline)) void _runqueue_pop(thread_t *thread
 {
     DEBUG("sched_set_status: removing thread %" PRIkernel_pid " from runqueue %" PRIu8 ".\n",
           thread->pid, thread->priority);
-    clist_lpop(&sched_runqueues[thread->priority]);
+    clist_remove(&sched_runqueues[thread->priority], &thread->rq_entry);
 
     if (!sched_runqueues[thread->priority].next) {
         _clear_runqueue_bit(thread->priority);
diff --git a/tests/drivers/xbee/Makefile.ci b/tests/drivers/xbee/Makefile.ci
index 621348d782..0c526d486b 100644
--- a/tests/drivers/xbee/Makefile.ci
+++ b/tests/drivers/xbee/Makefile.ci
@@ -12,6 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := \
     nucleo-f042k6 \
     nucleo-f334r8 \
     nucleo-l011k4 \
+    nucleo-l031k6 \
     samd10-xmini \
     stk3200 \
     stm32f030f4-demo \