diff --git a/Kbuild b/Kbuild
index 3132fd74b60..4d36e5ef927 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,15 +1,5 @@
 # vim: filetype=make
 
-ifeq (${CONFIG_NUM_COMMAND_PACKETS},)
-CONFIG_NUM_COMMAND_PACKETS=0
-endif
-ifeq (${CONFIG_NUM_TIMER_PACKETS},)
-CONFIG_NUM_TIMER_PACKETS=0
-endif
-ifeq (${CONFIG_NUM_TASK_PRIORITIES},)
-CONFIG_NUM_TASK_PRIORITIES=$(CONFIG_NUM_PREEMPT_PRIORITIES)
-endif
-
 define filechk_configs.c
 	(echo "/* file is auto-generated, do not modify ! */"; \
 	echo; \
diff --git a/tests/benchmarks/app_kernel/prj_fp.conf b/tests/benchmarks/app_kernel/prj_fp.conf
index a784069aa9c..7aa914ce626 100644
--- a/tests/benchmarks/app_kernel/prj_fp.conf
+++ b/tests/benchmarks/app_kernel/prj_fp.conf
@@ -5,7 +5,6 @@ CONFIG_FLOAT=y
 CONFIG_SSE=y
 CONFIG_FP_SHARING=y
 CONFIG_SSE_FP_MATH=y
-CONFIG_NUM_COMMAND_PACKETS=20
 
 # eliminate timer interrupts during the benchmark
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1
diff --git a/tests/benchmarks/app_kernel/prj_no_fp.conf b/tests/benchmarks/app_kernel/prj_no_fp.conf
index 0c3a22bf00f..5ebc5c3747a 100644
--- a/tests/benchmarks/app_kernel/prj_no_fp.conf
+++ b/tests/benchmarks/app_kernel/prj_no_fp.conf
@@ -1,6 +1,5 @@
 # all printf, fprintf to stdout go to console
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_NUM_COMMAND_PACKETS=20
 
 # eliminate timer interrupts during the benchmark
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1
diff --git a/tests/benchmarks/footprint/float/arm.conf b/tests/benchmarks/footprint/float/arm.conf
index e87c02f66af..bbfa770e2d7 100644
--- a/tests/benchmarks/footprint/float/arm.conf
+++ b/tests/benchmarks/footprint/float/arm.conf
@@ -3,9 +3,6 @@ CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_COMMAND_STACK_SIZE=64
 CONFIG_PRINTK=y
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_NUM_TASK_PRIORITIES=64
-CONFIG_NUM_COMMAND_PACKETS=64
-CONFIG_NUM_TIMER_PACKETS=16
 CONFIG_HEAP_MEM_POOL_SIZE=256
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_THREAD_CUSTOM_DATA=y
diff --git a/tests/benchmarks/footprint/float/x86.conf b/tests/benchmarks/footprint/float/x86.conf
index 7487201689f..bc217795326 100644
--- a/tests/benchmarks/footprint/float/x86.conf
+++ b/tests/benchmarks/footprint/float/x86.conf
@@ -4,9 +4,6 @@ CONFIG_COMMAND_STACK_SIZE=64
 CONFIG_PRINTK=y
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_IDT_NUM_VECTORS=256
-CONFIG_NUM_TASK_PRIORITIES=64
-CONFIG_NUM_COMMAND_PACKETS=64
-CONFIG_NUM_TIMER_PACKETS=16
 CONFIG_HEAP_MEM_POOL_SIZE=256
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_FLOAT=y
diff --git a/tests/benchmarks/footprint/max/arm.conf b/tests/benchmarks/footprint/max/arm.conf
index 85519dd95c3..410d38ffc72 100644
--- a/tests/benchmarks/footprint/max/arm.conf
+++ b/tests/benchmarks/footprint/max/arm.conf
@@ -3,9 +3,6 @@ CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_COMMAND_STACK_SIZE=64
 CONFIG_PRINTK=y
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_NUM_TASK_PRIORITIES=64
-CONFIG_NUM_COMMAND_PACKETS=64
-CONFIG_NUM_TIMER_PACKETS=16
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_NUM_IRQS=43
 CONFIG_THREAD_CUSTOM_DATA=y
diff --git a/tests/benchmarks/footprint/max/x86.conf b/tests/benchmarks/footprint/max/x86.conf
index 2cc4fb4b6ae..ba0cf9ca314 100644
--- a/tests/benchmarks/footprint/max/x86.conf
+++ b/tests/benchmarks/footprint/max/x86.conf
@@ -4,9 +4,6 @@ CONFIG_COMMAND_STACK_SIZE=64
 CONFIG_PRINTK=y
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_IDT_NUM_VECTORS=256
-CONFIG_NUM_TASK_PRIORITIES=64
-CONFIG_NUM_COMMAND_PACKETS=64
-CONFIG_NUM_TIMER_PACKETS=16
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_THREAD_CUSTOM_DATA=y
 CONFIG_HEAP_MEM_POOL_SIZE=256
diff --git a/tests/benchmarks/footprint/min/arm.conf b/tests/benchmarks/footprint/min/arm.conf
index cf50b15c8d1..cbf30413c6b 100644
--- a/tests/benchmarks/footprint/min/arm.conf
+++ b/tests/benchmarks/footprint/min/arm.conf
@@ -3,9 +3,6 @@ CONFIG_MAIN_STACK_SIZE=256
 CONFIG_COMMAND_STACK_SIZE=2
 CONFIG_TIMESLICING=n
 CONFIG_PRINTK=n
-CONFIG_NUM_TASK_PRIORITIES=2
-CONFIG_NUM_COMMAND_PACKETS=8
-CONFIG_NUM_TIMER_PACKETS=4
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_ERRNO=n
diff --git a/tests/benchmarks/footprint/min/galileo.conf b/tests/benchmarks/footprint/min/galileo.conf
index 28cb2ef573b..bbc96a77d17 100644
--- a/tests/benchmarks/footprint/min/galileo.conf
+++ b/tests/benchmarks/footprint/min/galileo.conf
@@ -5,9 +5,6 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=0
 CONFIG_PRINTK=n
 CONFIG_HPET_TIMER_IRQ_PRIORITY=2
 CONFIG_IDT_NUM_VECTORS=36
-CONFIG_NUM_TASK_PRIORITIES=2
-CONFIG_NUM_COMMAND_PACKETS=8
-CONFIG_NUM_TIMER_PACKETS=4
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_PINMUX=n
diff --git a/tests/benchmarks/footprint/min/x86.conf b/tests/benchmarks/footprint/min/x86.conf
index dd457c209ce..b147b760c11 100644
--- a/tests/benchmarks/footprint/min/x86.conf
+++ b/tests/benchmarks/footprint/min/x86.conf
@@ -5,9 +5,6 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=0
 CONFIG_PRINTK=n
 CONFIG_HPET_TIMER_IRQ_PRIORITY=2
 CONFIG_IDT_NUM_VECTORS=33
-CONFIG_NUM_TASK_PRIORITIES=2
-CONFIG_NUM_COMMAND_PACKETS=8
-CONFIG_NUM_TIMER_PACKETS=4
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_IPM=n
diff --git a/tests/benchmarks/footprint/reg/arm.conf b/tests/benchmarks/footprint/reg/arm.conf
index 73676e07818..3c54dc7c778 100644
--- a/tests/benchmarks/footprint/reg/arm.conf
+++ b/tests/benchmarks/footprint/reg/arm.conf
@@ -4,6 +4,3 @@ CONFIG_COMMAND_STACK_SIZE=8
 CONFIG_PRINTK=y
 
 CONFIG_NUM_IRQS=1
-CONFIG_NUM_TASK_PRIORITIES=16
-CONFIG_NUM_COMMAND_PACKETS=32
-CONFIG_NUM_TIMER_PACKETS=8
diff --git a/tests/benchmarks/footprint/reg/x86.conf b/tests/benchmarks/footprint/reg/x86.conf
index f41b178b7c4..4cd685a3967 100644
--- a/tests/benchmarks/footprint/reg/x86.conf
+++ b/tests/benchmarks/footprint/reg/x86.conf
@@ -3,7 +3,4 @@ CONFIG_MAIN_STACK_SIZE=512
 CONFIG_COMMAND_STACK_SIZE=8
 CONFIG_PRINTK=y
 CONFIG_IDT_NUM_VECTORS=128
-CONFIG_NUM_TASK_PRIORITIES=16
-CONFIG_NUM_COMMAND_PACKETS=32
-CONFIG_NUM_TIMER_PACKETS=8
 CONFIG_USB=n
diff --git a/tests/kernel/critical/prj.conf b/tests/kernel/critical/prj.conf
index f4058ca9780..9467c292689 100644
--- a/tests/kernel/critical/prj.conf
+++ b/tests/kernel/critical/prj.conf
@@ -1,2 +1 @@
-CONFIG_NUM_TASK_PRIORITIES=50
 CONFIG_ZTEST=y