diff --git a/tests/application_development/cpp/CMakeLists.txt b/tests/subsys/cpp/cxx/CMakeLists.txt
similarity index 100%
rename from tests/application_development/cpp/CMakeLists.txt
rename to tests/subsys/cpp/cxx/CMakeLists.txt
diff --git a/tests/application_development/cpp/prj.conf b/tests/subsys/cpp/cxx/prj.conf
similarity index 100%
rename from tests/application_development/cpp/prj.conf
rename to tests/subsys/cpp/cxx/prj.conf
diff --git a/tests/application_development/cpp/src/main.cpp b/tests/subsys/cpp/cxx/src/main.cpp
similarity index 100%
rename from tests/application_development/cpp/src/main.cpp
rename to tests/subsys/cpp/cxx/src/main.cpp
diff --git a/tests/application_development/cpp/testcase.yaml b/tests/subsys/cpp/cxx/testcase.yaml
similarity index 100%
rename from tests/application_development/cpp/testcase.yaml
rename to tests/subsys/cpp/cxx/testcase.yaml
diff --git a/tests/application_development/libcxx/CMakeLists.txt b/tests/subsys/cpp/libcxx/CMakeLists.txt
similarity index 100%
rename from tests/application_development/libcxx/CMakeLists.txt
rename to tests/subsys/cpp/libcxx/CMakeLists.txt
diff --git a/tests/application_development/libcxx/prj.conf b/tests/subsys/cpp/libcxx/prj.conf
similarity index 100%
rename from tests/application_development/libcxx/prj.conf
rename to tests/subsys/cpp/libcxx/prj.conf
diff --git a/tests/application_development/libcxx/src/main.cpp b/tests/subsys/cpp/libcxx/src/main.cpp
similarity index 100%
rename from tests/application_development/libcxx/src/main.cpp
rename to tests/subsys/cpp/libcxx/src/main.cpp
diff --git a/tests/application_development/libcxx/testcase.yaml b/tests/subsys/cpp/libcxx/testcase.yaml
similarity index 100%
rename from tests/application_development/libcxx/testcase.yaml
rename to tests/subsys/cpp/libcxx/testcase.yaml