diff --git a/tests/subsys/mgmt/smp_reassembly/CMakeLists.txt b/tests/subsys/mgmt/mcumgr/smp_reassembly/CMakeLists.txt
similarity index 100%
rename from tests/subsys/mgmt/smp_reassembly/CMakeLists.txt
rename to tests/subsys/mgmt/mcumgr/smp_reassembly/CMakeLists.txt
diff --git a/tests/subsys/mgmt/smp_reassembly/Kconfig b/tests/subsys/mgmt/mcumgr/smp_reassembly/Kconfig
similarity index 100%
rename from tests/subsys/mgmt/smp_reassembly/Kconfig
rename to tests/subsys/mgmt/mcumgr/smp_reassembly/Kconfig
diff --git a/tests/subsys/mgmt/smp_reassembly/prj.conf b/tests/subsys/mgmt/mcumgr/smp_reassembly/prj.conf
similarity index 100%
rename from tests/subsys/mgmt/smp_reassembly/prj.conf
rename to tests/subsys/mgmt/mcumgr/smp_reassembly/prj.conf
diff --git a/tests/subsys/mgmt/smp_reassembly/src/main.c b/tests/subsys/mgmt/mcumgr/smp_reassembly/src/main.c
similarity index 98%
rename from tests/subsys/mgmt/smp_reassembly/src/main.c
rename to tests/subsys/mgmt/mcumgr/smp_reassembly/src/main.c
index 2997ed5b592..e963fd3282a 100644
--- a/tests/subsys/mgmt/smp_reassembly/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/smp_reassembly/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/mgmt/mcumgr/smp.h>
 #include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
-#include "../../../../../subsys/mgmt/mcumgr/smp_reassembly.h"
+#include "../../../../../../subsys/mgmt/mcumgr/smp_reassembly.h"
 
 static struct zephyr_smp_transport zst;
 static uint8_t buff[CONFIG_MCUMGR_BUF_SIZE];
diff --git a/tests/subsys/mgmt/smp_reassembly/testcase.yaml b/tests/subsys/mgmt/mcumgr/smp_reassembly/testcase.yaml
similarity index 100%
rename from tests/subsys/mgmt/smp_reassembly/testcase.yaml
rename to tests/subsys/mgmt/mcumgr/smp_reassembly/testcase.yaml
diff --git a/tests/subsys/mgmt/zcbor_bulk/CMakeLists.txt b/tests/subsys/mgmt/mcumgr/zcbor_bulk/CMakeLists.txt
similarity index 100%
rename from tests/subsys/mgmt/zcbor_bulk/CMakeLists.txt
rename to tests/subsys/mgmt/mcumgr/zcbor_bulk/CMakeLists.txt
diff --git a/tests/subsys/mgmt/zcbor_bulk/prj.conf b/tests/subsys/mgmt/mcumgr/zcbor_bulk/prj.conf
similarity index 100%
rename from tests/subsys/mgmt/zcbor_bulk/prj.conf
rename to tests/subsys/mgmt/mcumgr/zcbor_bulk/prj.conf
diff --git a/tests/subsys/mgmt/zcbor_bulk/src/main.c b/tests/subsys/mgmt/mcumgr/zcbor_bulk/src/main.c
similarity index 100%
rename from tests/subsys/mgmt/zcbor_bulk/src/main.c
rename to tests/subsys/mgmt/mcumgr/zcbor_bulk/src/main.c
diff --git a/tests/subsys/mgmt/zcbor_bulk/testcase.yaml b/tests/subsys/mgmt/mcumgr/zcbor_bulk/testcase.yaml
similarity index 100%
rename from tests/subsys/mgmt/zcbor_bulk/testcase.yaml
rename to tests/subsys/mgmt/mcumgr/zcbor_bulk/testcase.yaml