diff --git a/examples/extra_test_suites/dma350_s/CMakeLists.txt b/examples/corstone310_fvp_dma/dma350_s/CMakeLists.txt
similarity index 100%
rename from examples/extra_test_suites/dma350_s/CMakeLists.txt
rename to examples/corstone310_fvp_dma/dma350_s/CMakeLists.txt
diff --git a/examples/extra_test_suites/dma350_s/dma350_s_test.c b/examples/corstone310_fvp_dma/dma350_s/dma350_s_test.c
similarity index 100%
rename from examples/extra_test_suites/dma350_s/dma350_s_test.c
rename to examples/corstone310_fvp_dma/dma350_s/dma350_s_test.c
diff --git a/examples/extra_test_suites/dma350_s/dma350_s_test.h b/examples/corstone310_fvp_dma/dma350_s/dma350_s_test.h
similarity index 100%
rename from examples/extra_test_suites/dma350_s/dma350_s_test.h
rename to examples/corstone310_fvp_dma/dma350_s/dma350_s_test.h
diff --git a/examples/extra_test_suites/dma350_s/readme.rst b/examples/corstone310_fvp_dma/dma350_s/readme.rst
similarity index 90%
rename from examples/extra_test_suites/dma350_s/readme.rst
rename to examples/corstone310_fvp_dma/dma350_s/readme.rst
index c69c48b..862d9f6 100644
--- a/examples/extra_test_suites/dma350_s/readme.rst
+++ b/examples/corstone310_fvp_dma/dma350_s/readme.rst
@@ -14,7 +14,7 @@
 
 .. code-block:: bash
 
- $ cmake -S . -B cmake_build -DTFM_PLATFORM=arm/mps3/corstone310_fvp -DTFM_TOOLCHAIN_FILE=toolchain_ARMCLANG.cmake -DEXTRA_S_TEST_SUITES_PATHS=<tf-m-extras root>/examples/extra_test_suites/dma350_s
+ $ cmake -S . -B cmake_build -DTFM_PLATFORM=arm/mps3/corstone310_fvp -DTFM_TOOLCHAIN_FILE=toolchain_ARMCLANG.cmake -DEXTRA_S_TEST_SUITES_PATHS=<tf-m-extras root>/examples/corstone310_fvp_dma/dma350_s
 
 2. Then:
 
diff --git a/examples/examples_readme.rst b/examples/examples_readme.rst
index 3aba38a..c36c6d6 100755
--- a/examples/examples_readme.rst
+++ b/examples/examples_readme.rst
@@ -18,8 +18,8 @@
 - Bence Balogh `<bence.balogh@arm.com> <bence.balogh@arm.com>`_
 - Mark Horvath `<mark.horvath@arm.com> <mark.horvath@arm.com>`_
 
-extra_test_suites
-=================
+extra_test_suites_example
+=========================
 
 Description
 -----------
diff --git a/examples/extra_test_suites/extra_ns/CMakeLists.txt b/examples/extra_test_suites_example/extra_ns/CMakeLists.txt
similarity index 100%
rename from examples/extra_test_suites/extra_ns/CMakeLists.txt
rename to examples/extra_test_suites_example/extra_ns/CMakeLists.txt
diff --git a/examples/extra_test_suites/extra_ns/ns_test.c b/examples/extra_test_suites_example/extra_ns/ns_test.c
similarity index 100%
rename from examples/extra_test_suites/extra_ns/ns_test.c
rename to examples/extra_test_suites_example/extra_ns/ns_test.c
diff --git a/examples/extra_test_suites/extra_ns/ns_test.h b/examples/extra_test_suites_example/extra_ns/ns_test.h
similarity index 100%
rename from examples/extra_test_suites/extra_ns/ns_test.h
rename to examples/extra_test_suites_example/extra_ns/ns_test.h
diff --git a/examples/extra_test_suites/extra_ns/ns_test_config.cmake b/examples/extra_test_suites_example/extra_ns/ns_test_config.cmake
similarity index 100%
rename from examples/extra_test_suites/extra_ns/ns_test_config.cmake
rename to examples/extra_test_suites_example/extra_ns/ns_test_config.cmake
diff --git a/examples/extra_test_suites/extra_s/CMakeLists.txt b/examples/extra_test_suites_example/extra_s/CMakeLists.txt
similarity index 100%
rename from examples/extra_test_suites/extra_s/CMakeLists.txt
rename to examples/extra_test_suites_example/extra_s/CMakeLists.txt
diff --git a/examples/extra_test_suites/extra_s/s_test.c b/examples/extra_test_suites_example/extra_s/s_test.c
similarity index 100%
rename from examples/extra_test_suites/extra_s/s_test.c
rename to examples/extra_test_suites_example/extra_s/s_test.c
diff --git a/examples/extra_test_suites/extra_s/s_test.h b/examples/extra_test_suites_example/extra_s/s_test.h
similarity index 100%
rename from examples/extra_test_suites/extra_s/s_test.h
rename to examples/extra_test_suites_example/extra_s/s_test.h
diff --git a/examples/extra_test_suites/extra_s/s_test_config.cmake b/examples/extra_test_suites_example/extra_s/s_test_config.cmake
similarity index 100%
rename from examples/extra_test_suites/extra_s/s_test_config.cmake
rename to examples/extra_test_suites_example/extra_s/s_test_config.cmake