diff --git a/tests/lldb-dwz/hello.c b/tests/lldb/lldb-dwz/hello.c
similarity index 100%
rename from tests/lldb-dwz/hello.c
rename to tests/lldb/lldb-dwz/hello.c
diff --git a/tests/lldb-dwz/main.fmf b/tests/lldb/lldb-dwz/main.fmf
similarity index 95%
rename from tests/lldb-dwz/main.fmf
rename to tests/lldb/lldb-dwz/main.fmf
index fe968c6..732bfac 100644
--- a/tests/lldb-dwz/main.fmf
+++ b/tests/lldb/lldb-dwz/main.fmf
@@ -1,5 +1,6 @@
 summary: "Test that lldb doesn't crash with dwz debuginfo"
 require+:
+  - lldb
   - gcc
   - dwz
 tier: 1
diff --git a/tests/lldb-dwz/test.sh b/tests/lldb/lldb-dwz/test.sh
similarity index 100%
rename from tests/lldb-dwz/test.sh
rename to tests/lldb/lldb-dwz/test.sh
diff --git a/tests/lldb-std-vector-prettyprint/main.fmf b/tests/lldb/lldb-std-vector-prettyprint/main.fmf
similarity index 97%
rename from tests/lldb-std-vector-prettyprint/main.fmf
rename to tests/lldb/lldb-std-vector-prettyprint/main.fmf
index 1d0f4c7..6217942 100644
--- a/tests/lldb-std-vector-prettyprint/main.fmf
+++ b/tests/lldb/lldb-std-vector-prettyprint/main.fmf
@@ -1,5 +1,6 @@
 summary: "Test lldb std::vector pretty printer"
 require+:
+  - lldb
   - gcc-c++
 tier: 1
 extra-summary: /tools/lldb/lldb-std-vector-prettyprint
diff --git a/tests/lldb-std-vector-prettyprint/test.cpp b/tests/lldb/lldb-std-vector-prettyprint/test.cpp
similarity index 100%
rename from tests/lldb-std-vector-prettyprint/test.cpp
rename to tests/lldb/lldb-std-vector-prettyprint/test.cpp
diff --git a/tests/lldb-std-vector-prettyprint/test.sh b/tests/lldb/lldb-std-vector-prettyprint/test.sh
similarity index 100%
rename from tests/lldb-std-vector-prettyprint/test.sh
rename to tests/lldb/lldb-std-vector-prettyprint/test.sh
diff --git a/tests/python-embedded-interpreter/main.fmf b/tests/lldb/python-embedded-interpreter/main.fmf
similarity index 96%
rename from tests/python-embedded-interpreter/main.fmf
rename to tests/lldb/python-embedded-interpreter/main.fmf
index 385cc12..109c7ae 100644
--- a/tests/python-embedded-interpreter/main.fmf
+++ b/tests/lldb/python-embedded-interpreter/main.fmf
@@ -1,6 +1,7 @@
 summary: "Test lldb embedded interpreter (rhbz#1567262)"
 description: "Ensure that lldb depends on python3-lldb"
 require+:
+  - lldb
   - gcc-c++
 tier: 1
 extra-summary: /tools/lldb/python-embedded-interpreter
diff --git a/tests/python-embedded-interpreter/test.cpp b/tests/lldb/python-embedded-interpreter/test.cpp
similarity index 100%
rename from tests/python-embedded-interpreter/test.cpp
rename to tests/lldb/python-embedded-interpreter/test.cpp
diff --git a/tests/python-embedded-interpreter/test.sh b/tests/lldb/python-embedded-interpreter/test.sh
similarity index 100%
rename from tests/python-embedded-interpreter/test.sh
rename to tests/lldb/python-embedded-interpreter/test.sh