diff --git a/components/freertos/test_apps/freertos/misc/test_freertos_backported_functions.c b/components/freertos/test_apps/freertos/kernel/queue/test_freertos_backported_functions.c
similarity index 100%
rename from components/freertos/test_apps/freertos/misc/test_freertos_backported_functions.c
rename to components/freertos/test_apps/freertos/kernel/queue/test_freertos_backported_functions.c
diff --git a/components/freertos/test_apps/freertos/misc/test_freertos_mutex.c b/components/freertos/test_apps/freertos/kernel/queue/test_freertos_mutex.c
similarity index 100%
rename from components/freertos/test_apps/freertos/misc/test_freertos_mutex.c
rename to components/freertos/test_apps/freertos/kernel/queue/test_freertos_mutex.c
diff --git a/components/freertos/test_apps/freertos/port/test_freertos_hooks.c b/components/freertos/test_apps/freertos/kernel/tasks/test_freertos_hooks.c
similarity index 100%
rename from components/freertos/test_apps/freertos/port/test_freertos_hooks.c
rename to components/freertos/test_apps/freertos/kernel/tasks/test_freertos_hooks.c
diff --git a/components/freertos/test_apps/freertos/misc/test_freertos_trace_utilities.c b/components/freertos/test_apps/freertos/kernel/tasks/test_freertos_trace_utilities.c
similarity index 100%
rename from components/freertos/test_apps/freertos/misc/test_freertos_trace_utilities.c
rename to components/freertos/test_apps/freertos/kernel/tasks/test_freertos_trace_utilities.c
diff --git a/components/freertos/test_apps/freertos/misc/test_preemption.c b/components/freertos/test_apps/freertos/kernel/tasks/test_preemption.c
similarity index 100%
rename from components/freertos/test_apps/freertos/misc/test_preemption.c
rename to components/freertos/test_apps/freertos/kernel/tasks/test_preemption.c
diff --git a/components/freertos/test_apps/freertos/port/test_newlib_reent.c b/components/freertos/test_apps/freertos/misc/test_newlib_reent.c
similarity index 100%
rename from components/freertos/test_apps/freertos/port/test_newlib_reent.c
rename to components/freertos/test_apps/freertos/misc/test_newlib_reent.c
diff --git a/components/freertos/test_apps/freertos/misc/test_panic.c b/components/freertos/test_apps/freertos/misc/test_panic.c
deleted file mode 100644
index 714db87aef..0000000000
--- a/components/freertos/test_apps/freertos/misc/test_panic.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- Test for multicore FreeRTOS. This test spins up threads, fiddles with queues etc.
-*/
-
-#include <esp_types.h>
-#include <stdio.h>
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/semphr.h"
-#include "freertos/queue.h"
-#include "unity.h"
-
-TEST_CASE("Panic handler", "[freertos][ignore]")
-{
-    volatile int *i;
-    i = (volatile int *)0x0;
-    *i = 1;
-}
diff --git a/components/freertos/test_apps/freertos/kernel/tasks/test_tasks_snapshot.c b/components/freertos/test_apps/freertos/port/test_tasks_snapshot.c
similarity index 100%
rename from components/freertos/test_apps/freertos/kernel/tasks/test_tasks_snapshot.c
rename to components/freertos/test_apps/freertos/port/test_tasks_snapshot.c
diff --git a/components/freertos/test_apps/freertos/misc/test_tlsp_del_cb.c b/components/freertos/test_apps/freertos/port/test_tlsp_del_cb.c
similarity index 100%
rename from components/freertos/test_apps/freertos/misc/test_tlsp_del_cb.c
rename to components/freertos/test_apps/freertos/port/test_tlsp_del_cb.c