diff --git a/samples/mpu/index.rst b/samples/mpu/index.rst
new file mode 100644
index 00000000000..697c9aca64a
--- /dev/null
+++ b/samples/mpu/index.rst
@@ -0,0 +1,10 @@
+.. _mmu_mpu--samples:
+
+MMU/MPU Samples
+###############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/mpu_stack_guard_test/Makefile b/samples/mpu/mpu_stack_guard_test/Makefile
similarity index 100%
rename from samples/mpu_stack_guard_test/Makefile
rename to samples/mpu/mpu_stack_guard_test/Makefile
diff --git a/samples/mpu_stack_guard_test/README.rst b/samples/mpu/mpu_stack_guard_test/README.rst
similarity index 100%
rename from samples/mpu_stack_guard_test/README.rst
rename to samples/mpu/mpu_stack_guard_test/README.rst
diff --git a/samples/mpu_stack_guard_test/prj.conf b/samples/mpu/mpu_stack_guard_test/prj.conf
similarity index 100%
rename from samples/mpu_stack_guard_test/prj.conf
rename to samples/mpu/mpu_stack_guard_test/prj.conf
diff --git a/samples/mpu_stack_guard_test/prj_stack_guard.conf b/samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf
similarity index 100%
rename from samples/mpu_stack_guard_test/prj_stack_guard.conf
rename to samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf
diff --git a/samples/mpu_stack_guard_test/src/Makefile b/samples/mpu/mpu_stack_guard_test/src/Makefile
similarity index 100%
rename from samples/mpu_stack_guard_test/src/Makefile
rename to samples/mpu/mpu_stack_guard_test/src/Makefile
diff --git a/samples/mpu_stack_guard_test/src/main.c b/samples/mpu/mpu_stack_guard_test/src/main.c
similarity index 100%
rename from samples/mpu_stack_guard_test/src/main.c
rename to samples/mpu/mpu_stack_guard_test/src/main.c
diff --git a/samples/mpu_stack_guard_test/testcase.ini b/samples/mpu/mpu_stack_guard_test/testcase.ini
similarity index 100%
rename from samples/mpu_stack_guard_test/testcase.ini
rename to samples/mpu/mpu_stack_guard_test/testcase.ini
diff --git a/samples/mpu_test/Makefile b/samples/mpu/mpu_test/Makefile
similarity index 100%
rename from samples/mpu_test/Makefile
rename to samples/mpu/mpu_test/Makefile
diff --git a/samples/mpu_test/README.rst b/samples/mpu/mpu_test/README.rst
similarity index 100%
rename from samples/mpu_test/README.rst
rename to samples/mpu/mpu_test/README.rst
diff --git a/samples/mpu_test/prj.conf b/samples/mpu/mpu_test/prj.conf
similarity index 100%
rename from samples/mpu_test/prj.conf
rename to samples/mpu/mpu_test/prj.conf
diff --git a/samples/mpu_test/prj_single.conf b/samples/mpu/mpu_test/prj_single.conf
similarity index 100%
rename from samples/mpu_test/prj_single.conf
rename to samples/mpu/mpu_test/prj_single.conf
diff --git a/samples/mpu_test/src/Makefile b/samples/mpu/mpu_test/src/Makefile
similarity index 100%
rename from samples/mpu_test/src/Makefile
rename to samples/mpu/mpu_test/src/Makefile
diff --git a/samples/mpu_test/src/main.c b/samples/mpu/mpu_test/src/main.c
similarity index 100%
rename from samples/mpu_test/src/main.c
rename to samples/mpu/mpu_test/src/main.c
diff --git a/samples/mpu_test/testcase.ini b/samples/mpu/mpu_test/testcase.ini
similarity index 100%
rename from samples/mpu_test/testcase.ini
rename to samples/mpu/mpu_test/testcase.ini
diff --git a/samples/samples.rst b/samples/samples.rst
index e62e2267975..7c68efba59a 100644
--- a/samples/samples.rst
+++ b/samples/samples.rst
@@ -11,8 +11,6 @@ Samples and Demos
    kernel
    basic/*
    subsys/subsys.rst
-   mpu_test/*
-   mpu_stack_guard_test/*
    net/net.rst
    bluetooth/bluetooth.rst
    sensor/*