diff --git a/tests/dir_spec.lua b/tests/core/dir_spec.lua
similarity index 100%
rename from tests/dir_spec.lua
rename to tests/core/dir_spec.lua
diff --git a/tests/ffi_integration_spec.lua b/tests/core/ffi_integration_spec.lua
similarity index 100%
rename from tests/ffi_integration_spec.lua
rename to tests/core/ffi_integration_spec.lua
diff --git a/tests/git_integration_spec.lua b/tests/core/git_integration_spec.lua
similarity index 100%
rename from tests/git_integration_spec.lua
rename to tests/core/git_integration_spec.lua
diff --git a/tests/history_flags_spec.lua b/tests/core/history_flags_spec.lua
similarity index 100%
rename from tests/history_flags_spec.lua
rename to tests/core/history_flags_spec.lua
diff --git a/tests/ignore_whitespace_spec.lua b/tests/core/ignore_whitespace_spec.lua
similarity index 100%
rename from tests/ignore_whitespace_spec.lua
rename to tests/core/ignore_whitespace_spec.lua
diff --git a/tests/installer_spec.lua b/tests/core/installer_spec.lua
similarity index 100%
rename from tests/installer_spec.lua
rename to tests/core/installer_spec.lua
diff --git a/tests/timeout_spec.lua b/tests/core/timeout_spec.lua
similarity index 100%
rename from tests/timeout_spec.lua
rename to tests/core/timeout_spec.lua
diff --git a/tests/render/conflict_accept_all_spec.lua b/tests/ui/conflict/conflict_accept_all_spec.lua
similarity index 100%
rename from tests/render/conflict_accept_all_spec.lua
rename to tests/ui/conflict/conflict_accept_all_spec.lua
diff --git a/tests/render/conflict_spec.lua b/tests/ui/conflict/conflict_spec.lua
similarity index 100%
rename from tests/render/conflict_spec.lua
rename to tests/ui/conflict/conflict_spec.lua
diff --git a/tests/render/core_spec.lua b/tests/ui/core_spec.lua
similarity index 100%
rename from tests/render/core_spec.lua
rename to tests/ui/core_spec.lua
diff --git a/tests/explorer_file_filter_spec.lua b/tests/ui/explorer/explorer_file_filter_spec.lua
similarity index 100%
rename from tests/explorer_file_filter_spec.lua
rename to tests/ui/explorer/explorer_file_filter_spec.lua
diff --git a/tests/explorer_spec.lua b/tests/ui/explorer/explorer_spec.lua
similarity index 100%
rename from tests/explorer_spec.lua
rename to tests/ui/explorer/explorer_spec.lua
diff --git a/tests/explorer_staging_spec.lua b/tests/ui/explorer/explorer_staging_spec.lua
similarity index 100%
rename from tests/explorer_staging_spec.lua
rename to tests/ui/explorer/explorer_staging_spec.lua
diff --git a/tests/render/lifecycle_spec.lua b/tests/ui/lifecycle/lifecycle_spec.lua
similarity index 100%
rename from tests/render/lifecycle_spec.lua
rename to tests/ui/lifecycle/lifecycle_spec.lua
diff --git a/tests/render/merge_alignment_spec.lua b/tests/ui/merge_alignment_spec.lua
similarity index 100%
rename from tests/render/merge_alignment_spec.lua
rename to tests/ui/merge_alignment_spec.lua
diff --git a/tests/render/semantic_tokens_spec.lua b/tests/ui/semantic_tokens_spec.lua
similarity index 100%
rename from tests/render/semantic_tokens_spec.lua
rename to tests/ui/semantic_tokens_spec.lua
diff --git a/tests/autoscroll_spec.lua b/tests/ui/view/autoscroll_spec.lua
similarity index 100%
rename from tests/autoscroll_spec.lua
rename to tests/ui/view/autoscroll_spec.lua
diff --git a/tests/render/diffget_diffput_spec.lua b/tests/ui/view/diffget_diffput_spec.lua
similarity index 100%
rename from tests/render/diffget_diffput_spec.lua
rename to tests/ui/view/diffget_diffput_spec.lua
diff --git a/tests/render/view_spec.lua b/tests/ui/view/view_spec.lua
similarity index 100%
rename from tests/render/view_spec.lua
rename to tests/ui/view/view_spec.lua