diff --git a/fp16-abi/main.fmf b/fp16-abi/main.fmf
deleted file mode 100644
index 098120e..0000000
--- a/fp16-abi/main.fmf
+++ /dev/null
@@ -1,32 +0,0 @@
-summary: Test that Float16 ABI matches with clang
-test: "$WITH_SCL ./test.sh"
-framework: shell
-tier: 1
-component:
-  - llvm-toolset
-  - compiler-rt
-
-adjust:
-  - because: "Float16 not supported on s390x or ppc64le"
-    enabled: false
-    when: arch == s390x or arch == ppc64le
-
-  # Common requirements when LLVM is not SCL-ized
-  - require+:
-      - clang
-      - compiler-rt
-    when: collection is not defined
-
-  # Requirements for SCL-ized LLVM
-  - require+:
-      - llvm-toolset-13.0-clang
-      - llvm-toolset-13.0-compiler-rt
-    when: collection == llvm-toolset-13.0
-  - require+:
-      - llvm-toolset-14.0-clang
-      - llvm-toolset-14.0-compiler-rt
-    when: collection == llvm-toolset-14.0
-  - require+:
-      - llvm-toolset-15.0-clang
-      - llvm-toolset-15.0-compiler-rt
-    when: collection == llvm-toolset-15.0
diff --git a/sanity/main.fmf b/sanity/main.fmf
deleted file mode 100644
index 5a19784..0000000
--- a/sanity/main.fmf
+++ /dev/null
@@ -1,32 +0,0 @@
-summary: compiler-rt sanity test with signed int overflow
-test: "$WITH_SCL ./test.sh"
-require: []
-framework: shell
-tier: 1
-component:
-  - llvm-toolset
-  - compiler-rt
-extra-summary: /tools/compiler-rt/sanity
-extra-task: /tools/compiler-rt/sanity
-extra-nitrate: TC#0614247
-
-adjust:
-  # Common requirements when LLVM is not SCL-ized
-  - require+:
-      - clang
-      - compiler-rt
-    when: collection is not defined
-
-  # Requirements for SCL-ized LLVM
-  - require+:
-      - llvm-toolset-13.0-clang
-      - llvm-toolset-13.0-compiler-rt
-    when: collection == llvm-toolset-13.0
-  - require+:
-      - llvm-toolset-14.0-clang
-      - llvm-toolset-14.0-compiler-rt
-    when: collection == llvm-toolset-14.0
-  - require+:
-      - llvm-toolset-15.0-clang
-      - llvm-toolset-15.0-compiler-rt
-    when: collection == llvm-toolset-15.0
diff --git a/broken-symlinks/main.fmf b/tests/broken-symlinks/main.fmf
similarity index 77%
rename from broken-symlinks/main.fmf
rename to tests/broken-symlinks/main.fmf
index 47be9ed..7c9b295 100644
--- a/broken-symlinks/main.fmf
+++ b/tests/broken-symlinks/main.fmf
@@ -1,17 +1,10 @@
 summary: Test that compiler-rt does not contain broken symlinks
-test: ./test.sh
-framework: shell
 tier: 1
-component:
-  - llvm-toolset
-  - compiler-rt
-require:
-  - compiler-rt
 
-link:
-  verifies: https://issues.redhat.com/browse/RHEL-7375
+link+:
+  - verifies: https://issues.redhat.com/browse/RHEL-7375
 
-adjust:
+adjust+:
   # Broken symlinks were fixed with Clang Resource directory moving in LLVM 17:
   # https://fedoraproject.org/wiki/Changes/LLVM-17#Detailed_Description
   # There are no plans to backport that, so we disable the test
diff --git a/broken-symlinks/test.sh b/tests/broken-symlinks/test.sh
similarity index 100%
rename from broken-symlinks/test.sh
rename to tests/broken-symlinks/test.sh
diff --git a/cross-compile-i686/main.fmf b/tests/cross-compile-i686/main.fmf
similarity index 56%
rename from cross-compile-i686/main.fmf
rename to tests/cross-compile-i686/main.fmf
index a9aabcc..92e3f73 100644
--- a/cross-compile-i686/main.fmf
+++ b/tests/cross-compile-i686/main.fmf
@@ -1,13 +1,13 @@
 summary: compiler-rt test for rhbz#1678240
-test: "$WITH_SCL ./test.sh"
-require: []
-framework: shell
+description: >
+  Test that clang -m32 -fsanitize looks for compiler-rt library in the
+  proper directory
 tier: 1
-component:
-  - llvm-toolset
-  - compiler-rt
 
-adjust:
+require+:
+  - compiler-rt.i686
+  - glibc-devel.i686
+adjust+:
   # Common requirements when LLVM is not SCL-ized
   - enabled: false
     because: "Test applicable only on x86_64 arch"
@@ -16,10 +16,3 @@ adjust:
   - enabled: false
     because: "compiler-rt.i686 packages not shipped in RHEL/CentOS"
     when: distro == rhel or distro == centos
-
-  - require+:
-      - clang
-      - compiler-rt.x86_64
-      - compiler-rt.i686
-      - glibc-devel.i686
-    when: collection is not defined
diff --git a/cross-compile-i686/test.c b/tests/cross-compile-i686/test.c
similarity index 100%
rename from cross-compile-i686/test.c
rename to tests/cross-compile-i686/test.c
diff --git a/cross-compile-i686/test.sh b/tests/cross-compile-i686/test.sh
similarity index 100%
rename from cross-compile-i686/test.sh
rename to tests/cross-compile-i686/test.sh
diff --git a/tests/fp16-abi/main.fmf b/tests/fp16-abi/main.fmf
new file mode 100644
index 0000000..30f884a
--- /dev/null
+++ b/tests/fp16-abi/main.fmf
@@ -0,0 +1,7 @@
+summary: Test that Float16 ABI matches with clang
+tier: 1
+
+adjust+:
+  - because: "Float16 not supported on s390x or ppc64le"
+    enabled: false
+    when: arch == s390x or arch == ppc64le
diff --git a/fp16-abi/test.cpp b/tests/fp16-abi/test.cpp
similarity index 100%
rename from fp16-abi/test.cpp
rename to tests/fp16-abi/test.cpp
diff --git a/fp16-abi/test.sh b/tests/fp16-abi/test.sh
similarity index 100%
rename from fp16-abi/test.sh
rename to tests/fp16-abi/test.sh
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..4efc1fb
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,49 @@
+# Common configuration for all the tests in this repo
+# All the tmt tests under this directory inherit the settings from this file
+component:
+  - llvm-toolset
+  - compiler-rt
+
+# Default QA contact. If more are relevant use 'contact+:' in each test metadata.
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+
+# All tests are shell by default. If a specific test uses another framework
+# such as beakerlib, define "framework: beakerlib" in the test's main.fmf
+framework: shell
+
+# Always define "test" key and override in adjust or in each specific test
+# metadata if needed.
+test: ./test.sh
+
+# Commonly used keys are initialized to empty.
+require: []
+link: []
+tag: []
+
+adjust+:
+  # Common requirements when LLVM is not SCL-ized
+  - require+:
+      - clang
+      - compiler-rt
+    when: collection is not defined
+
+  # Requirements for SCL-ized LLVM
+  # We need to override the test key to do the proper scl call
+  - test: scl enable llvm-toolset-13.0 -- ./test.sh
+    require+:
+      - llvm-toolset-13.0-clang
+      - llvm-toolset-13.0-compiler-rt
+    when: collection == llvm-toolset-13.0
+
+  - test: scl enable llvm-toolset-14.0 -- ./test.sh
+    require+:
+      - llvm-toolset-14.0-clang
+      - llvm-toolset-14.0-compiler-rt
+    when: collection == llvm-toolset-14.0
+
+  - test: scl enable llvm-toolset-15.0 -- ./test.sh
+    require+:
+      - llvm-toolset-15.0-clang
+      - llvm-toolset-15.0-compiler-rt
+    when: collection == llvm-toolset-15.0
diff --git a/tests/sanity/main.fmf b/tests/sanity/main.fmf
new file mode 100644
index 0000000..03ea1be
--- /dev/null
+++ b/tests/sanity/main.fmf
@@ -0,0 +1,5 @@
+summary: compiler-rt sanity test with signed int overflow
+tier: 1
+extra-summary: /tools/compiler-rt/sanity
+extra-task: /tools/compiler-rt/sanity
+extra-nitrate: TC#0614247
diff --git a/sanity/test.sh b/tests/sanity/test.sh
similarity index 100%
rename from sanity/test.sh
rename to tests/sanity/test.sh
diff --git a/sanity/test1.c b/tests/sanity/test1.c
similarity index 100%
rename from sanity/test1.c
rename to tests/sanity/test1.c