diff --git a/test/functional/tests/lazy_write/__init__.py b/test/functional/tests/fault_injection/__init__.py
similarity index 100%
rename from test/functional/tests/lazy_write/__init__.py
rename to test/functional/tests/fault_injection/__init__.py
diff --git a/test/functional/tests/fault/test_primary_device_error.py b/test/functional/tests/fault_injection/test_primary_device_error.py
similarity index 100%
rename from test/functional/tests/fault/test_primary_device_error.py
rename to test/functional/tests/fault_injection/test_primary_device_error.py
diff --git a/test/functional/tests/lazy_write/cleaning_policy/__init__.py b/test/functional/tests/lazy_writes/__init__.py
similarity index 100%
rename from test/functional/tests/lazy_write/cleaning_policy/__init__.py
rename to test/functional/tests/lazy_writes/__init__.py
diff --git a/test/functional/tests/lazy_writes/cleaning_policy/__init__.py b/test/functional/tests/lazy_writes/cleaning_policy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/functional/tests/lazy_write/cleaning_policy/test_acp.py b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py
similarity index 100%
rename from test/functional/tests/lazy_write/cleaning_policy/test_acp.py
rename to test/functional/tests/lazy_writes/cleaning_policy/test_acp.py
diff --git a/test/functional/tests/cleaning/test_alru.py b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py
similarity index 100%
rename from test/functional/tests/cleaning/test_alru.py
rename to test/functional/tests/lazy_writes/cleaning_policy/test_alru.py