diff --git a/tests/bench_sizeof_coretypes/main.c b/tests/bench_sizeof_coretypes/main.c
index eaf5f07b0d4d8a7b0c311db85dde576d4af08f1a..76ac94fbcb0c1b9fbe769ea37035b956ec783bbe 100644
--- a/tests/bench_sizeof_coretypes/main.c
+++ b/tests/bench_sizeof_coretypes/main.c
@@ -94,18 +94,21 @@ int main(void)
     P(flags);
 #endif
     P(rq_entry);
-#ifdef MODULE_CORE_MSG
+#if defined(MODULE_CORE_MSG) || defined(MODULE_CORE_THREAD_FLAGS) || defined(MODULE_CORE_MBOX)
     P(wait_data);
+#endif
+#ifdef MODULE_CORE_MSG
     P(msg_waiters);
     P(msg_queue);
     P(msg_array);
 #endif
-#ifdef DEVELHELP
-    P(name);
-#endif
 #if defined(DEVELHELP) || defined(SCHED_TEST_STACK) || defined(MODULE_MPU_STACK_GUARD)
     P(stack_start);
 #endif
+#ifdef DEVELHELP
+    P(name);
+    P(stack_size);
+#endif
 
     puts("\n[SUCCESS]");
     return 0;
diff --git a/tests/bench_sizeof_coretypes/tests/01-run.py b/tests/bench_sizeof_coretypes/tests/01-run.py
index b6b4d4d3672940d0ebd6cea386a779a2f167654a..f7cc0da9a8117d85c4e5f8c3c9f91cd2bbd5935e 100755
--- a/tests/bench_sizeof_coretypes/tests/01-run.py
+++ b/tests/bench_sizeof_coretypes/tests/01-run.py
@@ -6,8 +6,8 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 
-import os
 import sys
+from testrunner import run
 
 
 def testfunc(child):
@@ -15,6 +15,4 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
-    from testrunner import run
     sys.exit(run(testfunc))