diff --git a/tests/Tests.cmake b/tests/Tests.cmake
index cee13aaee..a1adc2f1d 100644
--- a/tests/Tests.cmake
+++ b/tests/Tests.cmake
@@ -5,4 +5,4 @@
 enable_testing()
 
 # Give control to the various subdirectories
-include(${CMAKE_SOURCE_DIR}/tests/Unit/UnitTests.cmake)
+include(${CMAKE_SOURCE_DIR}/tests/unit/UnitTests.cmake)
diff --git a/tests/Unit/llvm-lit-tests/CMakeLists.txt b/tests/Unit/llvm-lit-tests/CMakeLists.txt
deleted file mode 100644
index de2ce0a14..000000000
--- a/tests/Unit/llvm-lit-tests/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-configure_file(
-  ${CMAKE_SOURCE_DIR}/tests/Unit/llvm-lit-tests/lit.site.cfg.py.in
-  ${CMAKE_BINARY_DIR}/tests/Unit/llvm-lit-tests/lit.site.cfg.py @ONLY)
-
-add_test(NAME llvm-lit-tests
-         COMMAND lit -a ${CMAKE_BINARY_DIR}/tests/Unit/llvm-lit-tests/)
diff --git a/tests/Unit/CombingPass.cpp b/tests/unit/CombingPass.cpp
similarity index 100%
rename from tests/Unit/CombingPass.cpp
rename to tests/unit/CombingPass.cpp
diff --git a/tests/Unit/DLAStepManager.cpp b/tests/unit/DLAStepManager.cpp
similarity index 100%
rename from tests/Unit/DLAStepManager.cpp
rename to tests/unit/DLAStepManager.cpp
diff --git a/tests/Unit/DLASteps.cpp b/tests/unit/DLASteps.cpp
similarity index 100%
rename from tests/Unit/DLASteps.cpp
rename to tests/unit/DLASteps.cpp
diff --git a/tests/Unit/MarkForSerializationTest.cpp b/tests/unit/MarkForSerializationTest.cpp
similarity index 100%
rename from tests/Unit/MarkForSerializationTest.cpp
rename to tests/unit/MarkForSerializationTest.cpp
diff --git a/tests/Unit/Reachability/Reachability.cmake b/tests/unit/Reachability/Reachability.cmake
similarity index 100%
rename from tests/Unit/Reachability/Reachability.cmake
rename to tests/unit/Reachability/Reachability.cmake
diff --git a/tests/Unit/Reachability/ReachabilityPass.cpp b/tests/unit/Reachability/ReachabilityPass.cpp
similarity index 100%
rename from tests/Unit/Reachability/ReachabilityPass.cpp
rename to tests/unit/Reachability/ReachabilityPass.cpp
diff --git a/tests/Unit/Reachability/ReachabilityPass.h b/tests/unit/Reachability/ReachabilityPass.h
similarity index 100%
rename from tests/Unit/Reachability/ReachabilityPass.h
rename to tests/unit/Reachability/ReachabilityPass.h
diff --git a/tests/Unit/ReachabilityPass.cpp b/tests/unit/ReachabilityPass.cpp
similarity index 100%
rename from tests/Unit/ReachabilityPass.cpp
rename to tests/unit/ReachabilityPass.cpp
diff --git a/tests/Unit/TestGraphs/simple.dot b/tests/unit/TestGraphs/simple.dot
similarity index 100%
rename from tests/Unit/TestGraphs/simple.dot
rename to tests/unit/TestGraphs/simple.dot
diff --git a/tests/Unit/TestGraphs/trivial.dot b/tests/unit/TestGraphs/trivial.dot
similarity index 100%
rename from tests/Unit/TestGraphs/trivial.dot
rename to tests/unit/TestGraphs/trivial.dot
diff --git a/tests/Unit/UnitTests.cmake b/tests/unit/UnitTests.cmake
similarity index 98%
rename from tests/Unit/UnitTests.cmake
rename to tests/unit/UnitTests.cmake
index 6a84da5f7..7fd46560a 100644
--- a/tests/Unit/UnitTests.cmake
+++ b/tests/unit/UnitTests.cmake
@@ -6,7 +6,7 @@ cmake_policy(SET CMP0060 NEW)
 
 include(${CMAKE_INSTALL_PREFIX}/share/revng/qa/cmake/revng-qa.cmake)
 
-set(SRC "${CMAKE_SOURCE_DIR}/tests/Unit")
+set(SRC "${CMAKE_SOURCE_DIR}/tests/unit")
 
 include(${SRC}/llvm-lit-tests/CMakeLists.txt)
 
diff --git a/tests/Unit/ValueManipulationAnalysis.cpp b/tests/unit/ValueManipulationAnalysis.cpp
similarity index 100%
rename from tests/Unit/ValueManipulationAnalysis.cpp
rename to tests/unit/ValueManipulationAnalysis.cpp
diff --git a/tests/unit/llvm-lit-tests/CMakeLists.txt b/tests/unit/llvm-lit-tests/CMakeLists.txt
new file mode 100644
index 000000000..36fb5c831
--- /dev/null
+++ b/tests/unit/llvm-lit-tests/CMakeLists.txt
@@ -0,0 +1,6 @@
+configure_file(
+  ${CMAKE_SOURCE_DIR}/tests/unit/llvm-lit-tests/lit.site.cfg.py.in
+  ${CMAKE_BINARY_DIR}/tests/unit/llvm-lit-tests/lit.site.cfg.py @ONLY)
+
+add_test(NAME llvm-lit-tests
+         COMMAND lit -a ${CMAKE_BINARY_DIR}/tests/unit/llvm-lit-tests/)
diff --git a/tests/Unit/llvm-lit-tests/CheckAddPrimitiveTypes.ll.yml b/tests/unit/llvm-lit-tests/CheckAddPrimitiveTypes.ll.yml
similarity index 100%
rename from tests/Unit/llvm-lit-tests/CheckAddPrimitiveTypes.ll.yml
rename to tests/unit/llvm-lit-tests/CheckAddPrimitiveTypes.ll.yml
diff --git a/tests/Unit/llvm-lit-tests/CheckDLA.ll b/tests/unit/llvm-lit-tests/CheckDLA.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/CheckDLA.ll
rename to tests/unit/llvm-lit-tests/CheckDLA.ll
diff --git a/tests/Unit/llvm-lit-tests/CheckDLA.ll.yml b/tests/unit/llvm-lit-tests/CheckDLA.ll.yml
similarity index 100%
rename from tests/Unit/llvm-lit-tests/CheckDLA.ll.yml
rename to tests/unit/llvm-lit-tests/CheckDLA.ll.yml
diff --git a/tests/Unit/llvm-lit-tests/Example.ll b/tests/unit/llvm-lit-tests/Example.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/Example.ll
rename to tests/unit/llvm-lit-tests/Example.ll
diff --git a/tests/Unit/llvm-lit-tests/ExitSSA.ll b/tests/unit/llvm-lit-tests/ExitSSA.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/ExitSSA.ll
rename to tests/unit/llvm-lit-tests/ExitSSA.ll
diff --git a/tests/Unit/llvm-lit-tests/RemoveAndRestoreExtractValues.ll b/tests/unit/llvm-lit-tests/RemoveAndRestoreExtractValues.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/RemoveAndRestoreExtractValues.ll
rename to tests/unit/llvm-lit-tests/RemoveAndRestoreExtractValues.ll
diff --git a/tests/Unit/llvm-lit-tests/RemoveExtractValues.ll b/tests/unit/llvm-lit-tests/RemoveExtractValues.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/RemoveExtractValues.ll
rename to tests/unit/llvm-lit-tests/RemoveExtractValues.ll
diff --git a/tests/Unit/llvm-lit-tests/RestoreExtractValues.ll b/tests/unit/llvm-lit-tests/RestoreExtractValues.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/RestoreExtractValues.ll
rename to tests/unit/llvm-lit-tests/RestoreExtractValues.ll
diff --git a/tests/Unit/llvm-lit-tests/TwosComplementArithmeticNormalization.ll b/tests/unit/llvm-lit-tests/TwosComplementArithmeticNormalization.ll
similarity index 100%
rename from tests/Unit/llvm-lit-tests/TwosComplementArithmeticNormalization.ll
rename to tests/unit/llvm-lit-tests/TwosComplementArithmeticNormalization.ll
diff --git a/tests/Unit/llvm-lit-tests/lit.cfg.py b/tests/unit/llvm-lit-tests/lit.cfg.py
similarity index 100%
rename from tests/Unit/llvm-lit-tests/lit.cfg.py
rename to tests/unit/llvm-lit-tests/lit.cfg.py
diff --git a/tests/Unit/llvm-lit-tests/lit.site.cfg.py.in b/tests/unit/llvm-lit-tests/lit.site.cfg.py.in
similarity index 78%
rename from tests/Unit/llvm-lit-tests/lit.site.cfg.py.in
rename to tests/unit/llvm-lit-tests/lit.site.cfg.py.in
index dcaecfd2b..b51fbbc44 100644
--- a/tests/Unit/llvm-lit-tests/lit.site.cfg.py.in
+++ b/tests/unit/llvm-lit-tests/lit.site.cfg.py.in
@@ -7,4 +7,4 @@ import os
 config.my_src_root=r'@CMAKE_SOURCE_DIR@'
 config.my_obj_root=r'@CMAKE_BINARY_DIR@'
 lit_config.load_config(config, os.path.join(config.my_src_root,
-                                            'tests/Unit/llvm-lit-tests/lit.cfg.py'))
+                                            'tests/unit/llvm-lit-tests/lit.cfg.py'))