spec: Place test suites in design groups

99 files changed, 214 insertions, 47 deletions

diff --git a/generate_membench.py b/generate_membench.py
index 7b88e531..00f5c6e2 100755
--- a/generate_membench.py
+++ b/generate_membench.py
@@ -795,6 +795,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-{test.name}
 test-brief: |
@@ -816,7 +818,6 @@ test-description: {_block(test.desc)}
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: {test_suite_name}
 test-target: {source}
 type: memory-benchmark
 """)
diff --git a/rtemsspec/tests/spec-validation/group.yml b/rtemsspec/tests/spec-validation/group.yml
new file mode 100644
index 00000000..6e02b38e
--- /dev/null
+++ b/rtemsspec/tests/spec-validation/group.yml
@@ -0,0 +1,13 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+copyrights:
+- Copyright (C) 2023 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: true
+identifier: RTEMSTestSuites
+links: []
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
+text: |
+  The tests shall be a contained in test suites.
+type: requirement
diff --git a/rtemsspec/tests/spec-validation/ts.yml b/rtemsspec/tests/spec-validation/ts.yml
index cbea16f2..57ebe721 100644
--- a/rtemsspec/tests/spec-validation/ts.yml
+++ b/rtemsspec/tests/spec-validation/ts.yml
@@ -5,7 +5,9 @@ copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 description: The Blue Green description.
 enabled-by: true
-links: []
+links:
+- role: requirement-refinement
+  uid: group
 test-brief: The Blue Green brief description.
 test-code: |
   /* Blue green code for ${.:test-suite-name} */
diff --git a/rtemsspec/tests/spec/non-functional-more.yml b/rtemsspec/tests/spec/non-functional-more.yml
index 33c5b5d4..25cbfbf9 100644
--- a/rtemsspec/tests/spec/non-functional-more.yml
+++ b/rtemsspec/tests/spec/non-functional-more.yml
@@ -7,6 +7,10 @@ links:
   uid: root
 - role: spec-refinement
   spec-key: non-functional-type
+  spec-value: design-group
+  uid: non-functional
+- role: spec-refinement
+  spec-key: non-functional-type
   spec-value: performance-runtime
   uid: non-functional
 - role: spec-refinement
diff --git a/rtemsspec/validation.py b/rtemsspec/validation.py
index aa96e79f..729c25a1 100644
--- a/rtemsspec/validation.py
+++ b/rtemsspec/validation.py
@@ -498,7 +498,8 @@ class _TestSuiteItem(_TestItem):
     def generate(self, content: CContent, _base_directory: str,
                  _test_case_to_suites: _CaseToSuite) -> None:
         with content.defgroup_block(self.ident, self.name):
-            content.add("@ingroup RTEMSTestSuites")
+            group = self.item.parent("requirement-refinement")["identifier"]
+            content.add(f"@ingroup {group}")
             content.add_brief_description(self.brief)
             content.wrap(self.description)
             content.add("@{")
diff --git a/spec/bsp/val/mem-clock.yml b/spec/bsp/val/mem-clock.yml
index 08d16531..fadd87b8 100644
--- a/spec/bsp/val/mem-clock.yml
+++ b/spec/bsp/val/mem-clock.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-clock
 test-brief: |
diff --git a/spec/req/test-suites.yml b/spec/req/test-suites.yml
index 5f36b3e4..3bf136a4 100644
--- a/spec/req/test-suites.yml
+++ b/spec/req/test-suites.yml
@@ -1,14 +1,15 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 copyrights:
-- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
+identifier: RTEMSTestSuites
 links:
 - role: requirement-refinement
-  uid: root
-non-functional-type: design
+  uid: /req/root
+non-functional-type: design-group
 rationale: null
 references: []
 requirement-type: non-functional
 text: |
-  The validation and unit tests shall be a contained in test suites.
+  The tests shall be a contained in test suites.
 type: requirement
diff --git a/spec/rtems/barrier/val/mem-wait-rel-del.yml b/spec/rtems/barrier/val/mem-wait-rel-del.yml
index 48b24129..0563c81f 100644
--- a/spec/rtems/barrier/val/mem-wait-rel-del.yml
+++ b/spec/rtems/barrier/val/mem-wait-rel-del.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-wait-rel-del
 test-brief: |
diff --git a/spec/rtems/barrier/val/mem-wait-rel.yml b/spec/rtems/barrier/val/mem-wait-rel.yml
index 25f3528e..aef0969d 100644
--- a/spec/rtems/barrier/val/mem-wait-rel.yml
+++ b/spec/rtems/barrier/val/mem-wait-rel.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-wait-rel
 test-brief: |
diff --git a/spec/rtems/clock/val/mem-get-uptime.yml b/spec/rtems/clock/val/mem-get-uptime.yml
index ae299e4d..54d2b4e2 100644
--- a/spec/rtems/clock/val/mem-get-uptime.yml
+++ b/spec/rtems/clock/val/mem-get-uptime.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-uptime
 test-brief: |
diff --git a/spec/rtems/clock/val/mem-set-get-tod.yml b/spec/rtems/clock/val/mem-set-get-tod.yml
index a44c6c01..1c6190d0 100644
--- a/spec/rtems/clock/val/mem-set-get-tod.yml
+++ b/spec/rtems/clock/val/mem-set-get-tod.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-set-get-tod
 test-brief: |
diff --git a/spec/rtems/clock/val/mem-set.yml b/spec/rtems/clock/val/mem-set.yml
index 17a01e39..354facf4 100644
--- a/spec/rtems/clock/val/mem-set.yml
+++ b/spec/rtems/clock/val/mem-set.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-set
 test-brief: |
diff --git a/spec/rtems/event/val/mem-snd-rcv.yml b/spec/rtems/event/val/mem-snd-rcv.yml
index 1c7e7d14..18e5fcb4 100644
--- a/spec/rtems/event/val/mem-snd-rcv.yml
+++ b/spec/rtems/event/val/mem-snd-rcv.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-snd-rcv
 test-brief: |
diff --git a/spec/rtems/fatal/val/mem-fatal.yml b/spec/rtems/fatal/val/mem-fatal.yml
index 73c9c4be..9f14a811 100644
--- a/spec/rtems/fatal/val/mem-fatal.yml
+++ b/spec/rtems/fatal/val/mem-fatal.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-fatal
 test-brief: |
diff --git a/spec/rtems/message/val/mem-bcst-rcv.yml b/spec/rtems/message/val/mem-bcst-rcv.yml
index 4ed72b59..98578a0c 100644
--- a/spec/rtems/message/val/mem-bcst-rcv.yml
+++ b/spec/rtems/message/val/mem-bcst-rcv.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-bcst-rcv
 test-brief: |
diff --git a/spec/rtems/message/val/mem-snd-rcv-del.yml b/spec/rtems/message/val/mem-snd-rcv-del.yml
index 15ff9bc8..6471008c 100644
--- a/spec/rtems/message/val/mem-snd-rcv-del.yml
+++ b/spec/rtems/message/val/mem-snd-rcv-del.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-snd-rcv-del
 test-brief: |
diff --git a/spec/rtems/message/val/mem-snd-rcv.yml b/spec/rtems/message/val/mem-snd-rcv.yml
index f5a60582..cb45cecc 100644
--- a/spec/rtems/message/val/mem-snd-rcv.yml
+++ b/spec/rtems/message/val/mem-snd-rcv.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-snd-rcv
 test-brief: |
diff --git a/spec/rtems/message/val/mem-ugt-rcv.yml b/spec/rtems/message/val/mem-ugt-rcv.yml
index 4c96a02d..da49d5c6 100644
--- a/spec/rtems/message/val/mem-ugt-rcv.yml
+++ b/spec/rtems/message/val/mem-ugt-rcv.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-ugt-rcv
 test-brief: |
diff --git a/spec/rtems/part/val/mem-get-ret-del.yml b/spec/rtems/part/val/mem-get-ret-del.yml
index a9973ec8..8e2b9e48 100644
--- a/spec/rtems/part/val/mem-get-ret-del.yml
+++ b/spec/rtems/part/val/mem-get-ret-del.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-ret-del
 test-brief: |
diff --git a/spec/rtems/part/val/mem-get-ret.yml b/spec/rtems/part/val/mem-get-ret.yml
index 6154273a..9325fe0f 100644
--- a/spec/rtems/part/val/mem-get-ret.yml
+++ b/spec/rtems/part/val/mem-get-ret.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-ret
 test-brief: |
diff --git a/spec/rtems/ratemon/val/mem-period-del.yml b/spec/rtems/ratemon/val/mem-period-del.yml
index aa61f6d5..adf3c69e 100644
--- a/spec/rtems/ratemon/val/mem-period-del.yml
+++ b/spec/rtems/ratemon/val/mem-period-del.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-period-del
 test-brief: |
diff --git a/spec/rtems/ratemon/val/mem-period.yml b/spec/rtems/ratemon/val/mem-period.yml
index fe8ca219..2562d6d1 100644
--- a/spec/rtems/ratemon/val/mem-period.yml
+++ b/spec/rtems/ratemon/val/mem-period.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-period
 test-brief: |
diff --git a/spec/rtems/scheduler/val/mem-add-cpu.yml b/spec/rtems/scheduler/val/mem-add-cpu.yml
index c5e080d3..524e0f1f 100644
--- a/spec/rtems/scheduler/val/mem-add-cpu.yml
+++ b/spec/rtems/scheduler/val/mem-add-cpu.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-add-cpu
 test-brief: |
diff --git a/spec/rtems/scheduler/val/mem-rm-cpu.yml b/spec/rtems/scheduler/val/mem-rm-cpu.yml
index 83eaab75..154de260 100644
--- a/spec/rtems/scheduler/val/mem-rm-cpu.yml
+++ b/spec/rtems/scheduler/val/mem-rm-cpu.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-rm-cpu
 test-brief: |
diff --git a/spec/rtems/sem/val/mem-obt-rel-del.yml b/spec/rtems/sem/val/mem-obt-rel-del.yml
index 7e4851f3..87601577 100644
--- a/spec/rtems/sem/val/mem-obt-rel-del.yml
+++ b/spec/rtems/sem/val/mem-obt-rel-del.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-obt-rel-del
 test-brief: |
diff --git a/spec/rtems/sem/val/mem-obt-rel.yml b/spec/rtems/sem/val/mem-obt-rel.yml
index 0814edb3..76a29c06 100644
--- a/spec/rtems/sem/val/mem-obt-rel.yml
+++ b/spec/rtems/sem/val/mem-obt-rel.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-obt-rel
 test-brief: |
diff --git a/spec/rtems/signal/val/mem-catch-snd.yml b/spec/rtems/signal/val/mem-catch-snd.yml
index 5e55aa52..dfa244ef 100644
--- a/spec/rtems/signal/val/mem-catch-snd.yml
+++ b/spec/rtems/signal/val/mem-catch-snd.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-catch-snd
 test-brief: |
diff --git a/spec/rtems/task/val/mem-delete.yml b/spec/rtems/task/val/mem-delete.yml
index 39f7ddc0..f616f754 100644
--- a/spec/rtems/task/val/mem-delete.yml
+++ b/spec/rtems/task/val/mem-delete.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-delete
 test-brief: |
diff --git a/spec/rtems/task/val/mem-exit.yml b/spec/rtems/task/val/mem-exit.yml
index 92d21e07..2bc3a247 100644
--- a/spec/rtems/task/val/mem-exit.yml
+++ b/spec/rtems/task/val/mem-exit.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-exit
 test-brief: |
diff --git a/spec/rtems/task/val/mem-get-affinity.yml b/spec/rtems/task/val/mem-get-affinity.yml
index e5691985..a38f8e2d 100644
--- a/spec/rtems/task/val/mem-get-affinity.yml
+++ b/spec/rtems/task/val/mem-get-affinity.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-affinity
 test-brief: |
diff --git a/spec/rtems/task/val/mem-get-priority.yml b/spec/rtems/task/val/mem-get-priority.yml
index 34d4fec5..f39184f1 100644
--- a/spec/rtems/task/val/mem-get-priority.yml
+++ b/spec/rtems/task/val/mem-get-priority.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-priority
 test-brief: |
diff --git a/spec/rtems/task/val/mem-get-scheduler.yml b/spec/rtems/task/val/mem-get-scheduler.yml
index ae2e35ef..f1e40f57 100644
--- a/spec/rtems/task/val/mem-get-scheduler.yml
+++ b/spec/rtems/task/val/mem-get-scheduler.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-get-scheduler
 test-brief: |
diff --git a/spec/rtems/task/val/mem-mode.yml b/spec/rtems/task/val/mem-mode.yml
index 4cd38599..5edfab0d 100644
--- a/spec/rtems/task/val/mem-mode.yml
+++ b/spec/rtems/task/val/mem-mode.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-mode
 test-brief: |
diff --git a/spec/rtems/task/val/mem-restart.yml b/spec/rtems/task/val/mem-restart.yml
index c17cb549..1b190424 100644
--- a/spec/rtems/task/val/mem-restart.yml
+++ b/spec/rtems/task/val/mem-restart.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-restart
 test-brief: |
diff --git a/spec/rtems/task/val/mem-set-affinity.yml b/spec/rtems/task/val/mem-set-affinity.yml
index c4793343..f1a4105f 100644
--- a/spec/rtems/task/val/mem-set-affinity.yml
+++ b/spec/rtems/task/val/mem-set-affinity.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-set-affinity
 test-brief: |
diff --git a/spec/rtems/task/val/mem-set-priority.yml b/spec/rtems/task/val/mem-set-priority.yml
index 16f8b40d..a11751c4 100644
--- a/spec/rtems/task/val/mem-set-priority.yml
+++ b/spec/rtems/task/val/mem-set-priority.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-set-priority
 test-brief: |
diff --git a/spec/rtems/task/val/mem-set-scheduler.yml b/spec/rtems/task/val/mem-set-scheduler.yml
index 20fc8fba..2603e6aa 100644
--- a/spec/rtems/task/val/mem-set-scheduler.yml
+++ b/spec/rtems/task/val/mem-set-scheduler.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-set-scheduler
 test-brief: |
diff --git a/spec/rtems/task/val/mem-sus-res.yml b/spec/rtems/task/val/mem-sus-res.yml
index 097b9ddb..4cbf27f1 100644
--- a/spec/rtems/task/val/mem-sus-res.yml
+++ b/spec/rtems/task/val/mem-sus-res.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-sus-res
 test-brief: |
diff --git a/spec/rtems/task/val/mem-wake-after.yml b/spec/rtems/task/val/mem-wake-after.yml
index 8a456eda..f347aed7 100644
--- a/spec/rtems/task/val/mem-wake-after.yml
+++ b/spec/rtems/task/val/mem-wake-after.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-wake-after
 test-brief: |
diff --git a/spec/rtems/task/val/mem-wake-when.yml b/spec/rtems/task/val/mem-wake-when.yml
index aa950e52..7893b8ae 100644
--- a/spec/rtems/task/val/mem-wake-when.yml
+++ b/spec/rtems/task/val/mem-wake-when.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-wake-when
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-after.yml b/spec/rtems/timer/val/mem-after.yml
index bf1f1a7f..da3bb1f8 100644
--- a/spec/rtems/timer/val/mem-after.yml
+++ b/spec/rtems/timer/val/mem-after.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-after
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-cancel.yml b/spec/rtems/timer/val/mem-cancel.yml
index 32525b5a..aa0e9a0c 100644
--- a/spec/rtems/timer/val/mem-cancel.yml
+++ b/spec/rtems/timer/val/mem-cancel.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-cancel
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-delete.yml b/spec/rtems/timer/val/mem-delete.yml
index bf432c0a..183a7421 100644
--- a/spec/rtems/timer/val/mem-delete.yml
+++ b/spec/rtems/timer/val/mem-delete.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-delete
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-reset.yml b/spec/rtems/timer/val/mem-reset.yml
index cd7f96d4..0e12f4df 100644
--- a/spec/rtems/timer/val/mem-reset.yml
+++ b/spec/rtems/timer/val/mem-reset.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-reset
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-srv-after.yml b/spec/rtems/timer/val/mem-srv-after.yml
index 2fa7b37d..38e9bade 100644
--- a/spec/rtems/timer/val/mem-srv-after.yml
+++ b/spec/rtems/timer/val/mem-srv-after.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-srv-after
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-srv-init.yml b/spec/rtems/timer/val/mem-srv-init.yml
index 77bb2225..33d5839c 100644
--- a/spec/rtems/timer/val/mem-srv-init.yml
+++ b/spec/rtems/timer/val/mem-srv-init.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-srv-init
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-srv-when.yml b/spec/rtems/timer/val/mem-srv-when.yml
index 899a31eb..f59d24d5 100644
--- a/spec/rtems/timer/val/mem-srv-when.yml
+++ b/spec/rtems/timer/val/mem-srv-when.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-srv-when
 test-brief: |
diff --git a/spec/rtems/timer/val/mem-when.yml b/spec/rtems/timer/val/mem-when.yml
index 5afe73cd..7a71c3ae 100644
--- a/spec/rtems/timer/val/mem-when.yml
+++ b/spec/rtems/timer/val/mem-when.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-when
 test-brief: |
diff --git a/spec/rtems/userext/val/mem-create.yml b/spec/rtems/userext/val/mem-create.yml
index b9a3967a..c52e3dae 100644
--- a/spec/rtems/userext/val/mem-create.yml
+++ b/spec/rtems/userext/val/mem-create.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-create
 test-brief: |
diff --git a/spec/rtems/userext/val/mem-delete.yml b/spec/rtems/userext/val/mem-delete.yml
index 9fabc642..5c46b37f 100644
--- a/spec/rtems/userext/val/mem-delete.yml
+++ b/spec/rtems/userext/val/mem-delete.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-delete
 test-brief: |
diff --git a/spec/rtems/val/mem-basic.yml b/spec/rtems/val/mem-basic.yml
index 3d400e54..1957eda9 100644
--- a/spec/rtems/val/mem-basic.yml
+++ b/spec/rtems/val/mem-basic.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-basic
 test-brief: |
diff --git a/spec/rtems/val/mem-smp-1.yml b/spec/rtems/val/mem-smp-1.yml
index 44473054..054239ff 100644
--- a/spec/rtems/val/mem-smp-1.yml
+++ b/spec/rtems/val/mem-smp-1.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-smp-1
 test-brief: |
diff --git a/spec/rtems/val/mem-smp-global-2.yml b/spec/rtems/val/mem-smp-global-2.yml
index d256d1b4..74b96d2b 100644
--- a/spec/rtems/val/mem-smp-global-2.yml
+++ b/spec/rtems/val/mem-smp-global-2.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-smp-global-2
 test-brief: |
diff --git a/spec/rtems/val/mem-smp-global-4.yml b/spec/rtems/val/mem-smp-global-4.yml
index 3f66789d..06714072 100644
--- a/spec/rtems/val/mem-smp-global-4.yml
+++ b/spec/rtems/val/mem-smp-global-4.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-smp-global-4
 test-brief: |
diff --git a/spec/rtems/val/mem-smp-part-2.yml b/spec/rtems/val/mem-smp-part-2.yml
index bdce299a..3602e347 100644
--- a/spec/rtems/val/mem-smp-part-2.yml
+++ b/spec/rtems/val/mem-smp-part-2.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-smp-part-2
 test-brief: |
diff --git a/spec/rtems/val/mem-smp-part-4.yml b/spec/rtems/val/mem-smp-part-4.yml
index c1a9f5e5..ba6ecbbf 100644
--- a/spec/rtems/val/mem-smp-part-4.yml
+++ b/spec/rtems/val/mem-smp-part-4.yml
@@ -3,6 +3,8 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true
 links:
+- role: requirement-refinement
+  uid: /testsuites/membench
 - role: validation
   uid: ../req/mem-smp-part-4
 test-brief: |
diff --git a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml b/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
index 2a485f17..c44b36e5 100644
--- a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
+++ b/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: sparc/gr712rc
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains BSP-specific test cases.
 test-code: |
diff --git a/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml b/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
index a960620a..fe5a070b 100644
--- a/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
+++ b/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite uses an application configuration which triggers a
   fatal error during system initialization.
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
index d3655ae5..ec94b9d3 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
index 441d432b..3f11e283 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml b/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
index 7d8bc652..ee42946b 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml b/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
index 9c519a78..ad0fcb9f 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite provides an application configuration to perform a
   shutdown.
diff --git a/spec/testsuites/fatal-idle-thread-create-failed.yml b/spec/testsuites/fatal-idle-thread-create-failed.yml
index 1f5cd4d5..960663e6 100644
--- a/spec/testsuites/fatal-idle-thread-create-failed.yml
+++ b/spec/testsuites/fatal-idle-thread-create-failed.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which is triggered by a fatal
   error during system initialization.
diff --git a/spec/testsuites/fatal-idle-thread-stack-too-small.yml b/spec/testsuites/fatal-idle-thread-stack-too-small.yml
index 88255ad3..5e75d788 100644
--- a/spec/testsuites/fatal-idle-thread-stack-too-small.yml
+++ b/spec/testsuites/fatal-idle-thread-stack-too-small.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-init-task-construct-failed.yml b/spec/testsuites/fatal-init-task-construct-failed.yml
index 274eb5b5..9e518295 100644
--- a/spec/testsuites/fatal-init-task-construct-failed.yml
+++ b/spec/testsuites/fatal-init-task-construct-failed.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-mandatory-processor-not-present.yml b/spec/testsuites/fatal-mandatory-processor-not-present.yml
index 52c2a35b..9e7546f0 100644
--- a/spec/testsuites/fatal-mandatory-processor-not-present.yml
+++ b/spec/testsuites/fatal-mandatory-processor-not-present.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml b/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
index 2d653470..d8264e6c 100644
--- a/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
+++ b/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite uses an application configuration which triggers a
   fatal error during system initialization.
diff --git a/spec/testsuites/fatal-smp.yml b/spec/testsuites/fatal-smp.yml
index f66416b4..aa781189 100644
--- a/spec/testsuites/fatal-smp.yml
+++ b/spec/testsuites/fatal-smp.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers
   ${/glossary/smp:/term}-specific fatal errors.
diff --git a/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml b/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
index 110add14..7b545c8a 100644
--- a/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
+++ b/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-start-on-not-online-processor.yml b/spec/testsuites/fatal-start-on-not-online-processor.yml
index dd8bd66d..358d887e 100644
--- a/spec/testsuites/fatal-start-on-not-online-processor.yml
+++ b/spec/testsuites/fatal-start-on-not-online-processor.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/fatal-too-large-tls-size.yml b/spec/testsuites/fatal-too-large-tls-size.yml
index dd677bed..73bd605a 100644
--- a/spec/testsuites/fatal-too-large-tls-size.yml
+++ b/spec/testsuites/fatal-too-large-tls-size.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
diff --git a/spec/testsuites/membench.yml b/spec/testsuites/membench.yml
new file mode 100644
index 00000000..559604c6
--- /dev/null
+++ b/spec/testsuites/membench.yml
@@ -0,0 +1,15 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+copyrights:
+- Copyright (C) 2023 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: true
+identifier: RTEMSTestSuitesMembench
+links:
+- role: requirement-refinement
+  uid: /req/test-suites
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
+text: |
+  The memory benchmarks shall be a contained in test suites.
+type: requirement
diff --git a/spec/testsuites/model-0.yml b/spec/testsuites/model-0.yml
index 89e76a0c..289b9d1c 100644
--- a/spec/testsuites/model-0.yml
+++ b/spec/testsuites/model-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose test suite provides enough resources to run basic tests
   for all specified managers and functions.  It is intended for model based
diff --git a/spec/testsuites/performance-no-clock-0.yml b/spec/testsuites/performance-no-clock-0.yml
index c80a8589..94926aa7 100644
--- a/spec/testsuites/performance-no-clock-0.yml
+++ b/spec/testsuites/performance-no-clock-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose performance test suite provides enough resources to run
   basic performance tests for all specified managers and functions.
diff --git a/spec/testsuites/terminate.yml b/spec/testsuites/terminate.yml
index 1edbe512..ba6153a8 100644
--- a/spec/testsuites/terminate.yml
+++ b/spec/testsuites/terminate.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test case for the system termination
   procedure.
diff --git a/spec/testsuites/unit-no-clock-0.yml b/spec/testsuites/unit-no-clock-0.yml
index 80c92986..c76ac47c 100644
--- a/spec/testsuites/unit-no-clock-0.yml
+++ b/spec/testsuites/unit-no-clock-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: unit
 test-brief: |
   This general purpose unit test suite provides enough resources to run
   basic tests without a ${/glossary/clock-driver:/term} for all specified
diff --git a/spec/testsuites/unit.yml b/spec/testsuites/unit.yml
new file mode 100644
index 00000000..712606a6
--- /dev/null
+++ b/spec/testsuites/unit.yml
@@ -0,0 +1,15 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+copyrights:
+- Copyright (C) 2023 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: true
+identifier: RTEMSTestSuitesUnit
+links:
+- role: requirement-refinement
+  uid: /req/test-suites
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
+text: |
+  The unit tests shall be a contained in test suites.
+type: requirement
diff --git a/spec/testsuites/userext.yml b/spec/testsuites/userext.yml
index e60b7c27..1170221f 100644
--- a/spec/testsuites/userext.yml
+++ b/spec/testsuites/userext.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains a test cases related to the invocation of
   user extensions.
diff --git a/spec/testsuites/validation-0.yml b/spec/testsuites/validation-0.yml
index 09922c8f..28d340d9 100644
--- a/spec/testsuites/validation-0.yml
+++ b/spec/testsuites/validation-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests for all specified managers and functions.
diff --git a/spec/testsuites/validation-1.yml b/spec/testsuites/validation-1.yml
index e95d3abd..7a7190bf 100644
--- a/spec/testsuites/validation-1.yml
+++ b/spec/testsuites/validation-1.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests for all specified managers and functions.
diff --git a/spec/testsuites/validation-acfg-0.yml b/spec/testsuites/validation-acfg-0.yml
index 06e0521e..a63ec3d2 100644
--- a/spec/testsuites/validation-acfg-0.yml
+++ b/spec/testsuites/validation-acfg-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite is used to validate the default value of
   application configuration options taking the optional BSP provided settings
diff --git a/spec/testsuites/validation-acfg-1.yml b/spec/testsuites/validation-acfg-1.yml
index 16a023b6..d9221b91 100644
--- a/spec/testsuites/validation-acfg-1.yml
+++ b/spec/testsuites/validation-acfg-1.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite is used to validate the default value of
   application configuration options where all optional BSP provided settings
diff --git a/spec/testsuites/validation-cache.yml b/spec/testsuites/validation-cache.yml
index 2d64e2f6..41648341 100644
--- a/spec/testsuites/validation-cache.yml
+++ b/spec/testsuites/validation-cache.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite provides enough resources to run tests for the
   directives of the ${/rtems/cache/if/group:/name}.
diff --git a/spec/testsuites/validation-dev-0.yml b/spec/testsuites/validation-dev-0.yml
index 753c29e2..db70d2a0 100644
--- a/spec/testsuites/validation-dev-0.yml
+++ b/spec/testsuites/validation-dev-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   ${/glossary/target:/term}-specific tests.
diff --git a/spec/testsuites/validation-intr.yml b/spec/testsuites/validation-intr.yml
index 897c8e5f..f9dc2a1f 100644
--- a/spec/testsuites/validation-intr.yml
+++ b/spec/testsuites/validation-intr.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite provides enough resources to run tests for the
   interrupt controller related directives of the ${/rtems/intr/if/group:/name}.
diff --git a/spec/testsuites/validation-io-kernel.yml b/spec/testsuites/validation-io-kernel.yml
index 0fbf4d59..588d5f16 100644
--- a/spec/testsuites/validation-io-kernel.yml
+++ b/spec/testsuites/validation-io-kernel.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains test cases which test the kernel
   character input/output device provided by the ${/glossary/bsp:/term} before
diff --git a/spec/testsuites/validation-no-clock-0.yml b/spec/testsuites/validation-no-clock-0.yml
index f687e8e7..620be9c8 100644
--- a/spec/testsuites/validation-no-clock-0.yml
+++ b/spec/testsuites/validation-no-clock-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests without a ${/glossary/clock-driver:/term} for all specified
diff --git a/spec/testsuites/validation-non-smp.yml b/spec/testsuites/validation-non-smp.yml
index a48b1142..2c91e7ec 100644
--- a/spec/testsuites/validation-non-smp.yml
+++ b/spec/testsuites/validation-non-smp.yml
@@ -5,7 +5,7 @@ enabled-by:
   not: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This test suite for non-SMP test cases provides enough resources to run basic
   tests for all specified managers and functions.
diff --git a/spec/testsuites/validation-one-cpu-0.yml b/spec/testsuites/validation-one-cpu-0.yml
index ba605438..24d08469 100644
--- a/spec/testsuites/validation-one-cpu-0.yml
+++ b/spec/testsuites/validation-one-cpu-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests with exactly one processor and without a
diff --git a/spec/testsuites/validation-one-cpu-1.yml b/spec/testsuites/validation-one-cpu-1.yml
index 3b6febb2..ff32bef2 100644
--- a/spec/testsuites/validation-one-cpu-1.yml
+++ b/spec/testsuites/validation-one-cpu-1.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests with exactly one processor and without a
diff --git a/spec/testsuites/validation-smp-one-cpu-0.yml b/spec/testsuites/validation-smp-one-cpu-0.yml
index 7f997b2a..e7bd5f1f 100644
--- a/spec/testsuites/validation-smp-one-cpu-0.yml
+++ b/spec/testsuites/validation-smp-one-cpu-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   basic tests for all specified managers and functions in a configuration with
diff --git a/spec/testsuites/validation-smp-only-0.yml b/spec/testsuites/validation-smp-only-0.yml
index 4f810b0e..1fd5f73e 100644
--- a/spec/testsuites/validation-smp-only-0.yml
+++ b/spec/testsuites/validation-smp-only-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This test suite for SMP-only test cases provides enough resources to run
   basic tests for all specified managers and functions.
diff --git a/spec/testsuites/validation-smp-only-2.yml b/spec/testsuites/validation-smp-only-2.yml
index e25282c1..8491a5aa 100644
--- a/spec/testsuites/validation-smp-only-2.yml
+++ b/spec/testsuites/validation-smp-only-2.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This SMP-only test suite validates the clustered scheduler configuration
   through an application configuration with a processor maximum of two.  The
diff --git a/spec/testsuites/validation-timecounter-0.yml b/spec/testsuites/validation-timecounter-0.yml
index d69f9d2f..2d019e04 100644
--- a/spec/testsuites/validation-timecounter-0.yml
+++ b/spec/testsuites/validation-timecounter-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite is intended test cases related to the installation
   of timecouters.  The ${/glossary/clock-driver:/term} is disabled.
diff --git a/spec/testsuites/validation-timecounter-1.yml b/spec/testsuites/validation-timecounter-1.yml
index ee77a1c1..17920d01 100644
--- a/spec/testsuites/validation-timecounter-1.yml
+++ b/spec/testsuites/validation-timecounter-1.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite is intended test cases related to the use of
   timecouters.  The ${/glossary/clock-driver:/term} is enabled.
diff --git a/spec/testsuites/validation-timecounter-smp-0.yml b/spec/testsuites/validation-timecounter-smp-0.yml
index 06a83f93..0060a75f 100644
--- a/spec/testsuites/validation-timecounter-smp-0.yml
+++ b/spec/testsuites/validation-timecounter-smp-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: RTEMS_SMP
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite is intended test cases related to the use of
   timecouters.  The ${/glossary/clock-driver:/term} is disabled.
diff --git a/spec/testsuites/validation-tls-0.yml b/spec/testsuites/validation-tls-0.yml
index dcc0a69f..ee5395e7 100644
--- a/spec/testsuites/validation-tls-0.yml
+++ b/spec/testsuites/validation-tls-0.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains test cases related to the thread-local
   storage support.
diff --git a/spec/testsuites/validation-tls-1.yml b/spec/testsuites/validation-tls-1.yml
index f430983c..d3761c54 100644
--- a/spec/testsuites/validation-tls-1.yml
+++ b/spec/testsuites/validation-tls-1.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: true
 links:
 - role: requirement-refinement
-  uid: /req/test-suites
+  uid: validation
 test-brief: |
   This validation test suite contains test cases related to the thread-local
   storage support.
diff --git a/spec/testsuites/validation.yml b/spec/testsuites/validation.yml
new file mode 100644
index 00000000..9b8eb90d
--- /dev/null
+++ b/spec/testsuites/validation.yml
@@ -0,0 +1,15 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+copyrights:
+- Copyright (C) 2023 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: true
+identifier: RTEMSTestSuitesValidation
+links:
+- role: requirement-refinement
+  uid: /req/test-suites
+non-functional-type: design-group
+rationale: null
+references: []
+requirement-type: non-functional
+text: |
+  The validation tests shall be a contained in test suites.
+type: requirement