diff --git a/testing/nist-sts/.gitignore b/testing/drivers/rng/nist-sts/.gitignore
similarity index 100%
rename from testing/nist-sts/.gitignore
rename to testing/drivers/rng/nist-sts/.gitignore
diff --git a/testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch b/testing/drivers/rng/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
similarity index 100%
rename from testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
rename to testing/drivers/rng/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
diff --git a/testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch b/testing/drivers/rng/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
similarity index 100%
rename from testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
rename to testing/drivers/rng/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
diff --git a/testing/nist-sts/CMakeLists.txt b/testing/drivers/rng/nist-sts/CMakeLists.txt
similarity index 94%
rename from testing/nist-sts/CMakeLists.txt
rename to testing/drivers/rng/nist-sts/CMakeLists.txt
index e61b2b191..7b2a9da79 100644
--- a/testing/nist-sts/CMakeLists.txt
+++ b/testing/drivers/rng/nist-sts/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/nist-sts/CMakeLists.txt
+# apps/testing/drivers/rng/nist-sts/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -32,7 +32,8 @@ if(CONFIG_TESTING_NIST_STS)
     FetchContent_Declare(
       nist-sts_fetch
       URL ${CONFIG_NIST_URL} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/nist-sts
-          BINARY_DIR ${CMAKE_BINARY_DIR}/apps/testing/nist-sts/nist-sts
+          BINARY_DIR
+          ${CMAKE_BINARY_DIR}/apps/testing/drivers/rng/nist-sts/nist-sts
       PATCH_COMMAND
         patch -p0 -d ${CMAKE_CURRENT_LIST_DIR}/nist-sts <
         ${CMAKE_CURRENT_LIST_DIR}/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
diff --git a/testing/nist-sts/Kconfig b/testing/drivers/rng/nist-sts/Kconfig
similarity index 100%
rename from testing/nist-sts/Kconfig
rename to testing/drivers/rng/nist-sts/Kconfig
diff --git a/testing/nist-sts/Make.defs b/testing/drivers/rng/nist-sts/Make.defs
similarity index 90%
rename from testing/nist-sts/Make.defs
rename to testing/drivers/rng/nist-sts/Make.defs
index 3bb4a2e35..8bd85ad87 100644
--- a/testing/nist-sts/Make.defs
+++ b/testing/drivers/rng/nist-sts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/nist-sts/Make.defs
+# apps/testing/drivers/rng/nist-sts/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_NIST_STS),)
-CONFIGURED_APPS += $(APPDIR)/testing/nist-sts
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/rng/nist-sts
 endif
diff --git a/testing/nist-sts/Makefile b/testing/drivers/rng/nist-sts/Makefile
similarity index 98%
rename from testing/nist-sts/Makefile
rename to testing/drivers/rng/nist-sts/Makefile
index 4240db968..b7da67825 100644
--- a/testing/nist-sts/Makefile
+++ b/testing/drivers/rng/nist-sts/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/nist-sts/Makefile
+# apps/testing/drivers/rng/nist-sts/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #