diff --git a/.gitattributes b/.gitattributes
index 5043410c0..63eccdaf0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,7 +22,7 @@ Makefile text
 README text
 
 # Files in the lazyjson format require LF line endings
-tests/histories/*.json text eol=lf
+tests/history/histories/*.json text eol=lf
 
 # Binary files
 *.ico binary
diff --git a/tests/test_tracer.py b/tests/built_ins/test_tracer.py
similarity index 100%
rename from tests/test_tracer.py
rename to tests/built_ins/test_tracer.py
diff --git a/tests/test_wizard.py b/tests/built_ins/test_wizard.py
similarity index 100%
rename from tests/test_wizard.py
rename to tests/built_ins/test_wizard.py
diff --git a/tests/test_xonfig.py b/tests/built_ins/test_xonfig.py
similarity index 100%
rename from tests/test_xonfig.py
rename to tests/built_ins/test_xonfig.py
diff --git a/tests/test_xontribs.py b/tests/built_ins/test_xontribs.py
similarity index 100%
rename from tests/test_xontribs.py
rename to tests/built_ins/test_xontribs.py
diff --git a/tests/histories/echo.json b/tests/history/histories/echo.json
similarity index 100%
rename from tests/histories/echo.json
rename to tests/history/histories/echo.json
diff --git a/tests/histories/simple-python.json b/tests/history/histories/simple-python.json
similarity index 100%
rename from tests/histories/simple-python.json
rename to tests/history/histories/simple-python.json
diff --git a/tests/test_history_dummy.py b/tests/history/test_history_dummy.py
similarity index 100%
rename from tests/test_history_dummy.py
rename to tests/history/test_history_dummy.py
diff --git a/tests/test_history_json.py b/tests/history/test_history_json.py
similarity index 100%
rename from tests/test_history_json.py
rename to tests/history/test_history_json.py
diff --git a/tests/test_history_sqlite.py b/tests/history/test_history_sqlite.py
similarity index 100%
rename from tests/test_history_sqlite.py
rename to tests/history/test_history_sqlite.py
diff --git a/tests/test_lazyasd.py b/tests/lib/test_lazyasd.py
similarity index 100%
rename from tests/test_lazyasd.py
rename to tests/lib/test_lazyasd.py
diff --git a/tests/test_lazyjson.py b/tests/lib/test_lazyjson.py
similarity index 100%
rename from tests/test_lazyjson.py
rename to tests/lib/test_lazyjson.py
diff --git a/tests/test_jobs.py b/tests/procs/test_jobs.py
similarity index 100%
rename from tests/test_jobs.py
rename to tests/procs/test_jobs.py
diff --git a/tests/test_pipelines.py b/tests/procs/test_pipelines.py
similarity index 100%
rename from tests/test_pipelines.py
rename to tests/procs/test_pipelines.py