diff --git a/lit-test/compiler/codegen/warning_useless_bool.py b/lit-test/test/codegen/warning_useless_bool.py
similarity index 100%
rename from lit-test/compiler/codegen/warning_useless_bool.py
rename to lit-test/test/codegen/warning_useless_bool.py
diff --git a/lit-test/compiler/inferencer/builtin_calls.py b/lit-test/test/inferencer/builtin_calls.py
similarity index 100%
rename from lit-test/compiler/inferencer/builtin_calls.py
rename to lit-test/test/inferencer/builtin_calls.py
diff --git a/lit-test/compiler/inferencer/coerce.py b/lit-test/test/inferencer/coerce.py
similarity index 100%
rename from lit-test/compiler/inferencer/coerce.py
rename to lit-test/test/inferencer/coerce.py
diff --git a/lit-test/compiler/inferencer/error_assert.py b/lit-test/test/inferencer/error_assert.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_assert.py
rename to lit-test/test/inferencer/error_assert.py
diff --git a/lit-test/compiler/inferencer/error_builtin_calls.py b/lit-test/test/inferencer/error_builtin_calls.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_builtin_calls.py
rename to lit-test/test/inferencer/error_builtin_calls.py
diff --git a/lit-test/compiler/inferencer/error_call.py b/lit-test/test/inferencer/error_call.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_call.py
rename to lit-test/test/inferencer/error_call.py
diff --git a/lit-test/compiler/inferencer/error_coerce.py b/lit-test/test/inferencer/error_coerce.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_coerce.py
rename to lit-test/test/inferencer/error_coerce.py
diff --git a/lit-test/compiler/inferencer/error_comprehension.py b/lit-test/test/inferencer/error_comprehension.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_comprehension.py
rename to lit-test/test/inferencer/error_comprehension.py
diff --git a/lit-test/compiler/inferencer/error_control_flow.py b/lit-test/test/inferencer/error_control_flow.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_control_flow.py
rename to lit-test/test/inferencer/error_control_flow.py
diff --git a/lit-test/compiler/inferencer/error_exception.py b/lit-test/test/inferencer/error_exception.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_exception.py
rename to lit-test/test/inferencer/error_exception.py
diff --git a/lit-test/compiler/inferencer/error_iterable.py b/lit-test/test/inferencer/error_iterable.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_iterable.py
rename to lit-test/test/inferencer/error_iterable.py
diff --git a/lit-test/compiler/inferencer/error_local_unbound.py b/lit-test/test/inferencer/error_local_unbound.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_local_unbound.py
rename to lit-test/test/inferencer/error_local_unbound.py
diff --git a/lit-test/compiler/inferencer/error_locals.py b/lit-test/test/inferencer/error_locals.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_locals.py
rename to lit-test/test/inferencer/error_locals.py
diff --git a/lit-test/compiler/inferencer/error_return.py b/lit-test/test/inferencer/error_return.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_return.py
rename to lit-test/test/inferencer/error_return.py
diff --git a/lit-test/compiler/inferencer/error_subscript.py b/lit-test/test/inferencer/error_subscript.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_subscript.py
rename to lit-test/test/inferencer/error_subscript.py
diff --git a/lit-test/compiler/inferencer/error_unify.py b/lit-test/test/inferencer/error_unify.py
similarity index 100%
rename from lit-test/compiler/inferencer/error_unify.py
rename to lit-test/test/inferencer/error_unify.py
diff --git a/lit-test/compiler/inferencer/exception.py b/lit-test/test/inferencer/exception.py
similarity index 100%
rename from lit-test/compiler/inferencer/exception.py
rename to lit-test/test/inferencer/exception.py
diff --git a/lit-test/compiler/inferencer/gcd.py b/lit-test/test/inferencer/gcd.py
similarity index 100%
rename from lit-test/compiler/inferencer/gcd.py
rename to lit-test/test/inferencer/gcd.py
diff --git a/lit-test/compiler/inferencer/prelude.py b/lit-test/test/inferencer/prelude.py
similarity index 100%
rename from lit-test/compiler/inferencer/prelude.py
rename to lit-test/test/inferencer/prelude.py
diff --git a/lit-test/compiler/inferencer/scoping.py b/lit-test/test/inferencer/scoping.py
similarity index 100%
rename from lit-test/compiler/inferencer/scoping.py
rename to lit-test/test/inferencer/scoping.py
diff --git a/lit-test/compiler/inferencer/unify.py b/lit-test/test/inferencer/unify.py
similarity index 100%
rename from lit-test/compiler/inferencer/unify.py
rename to lit-test/test/inferencer/unify.py
diff --git a/lit-test/compiler/integration/arithmetics.py b/lit-test/test/integration/arithmetics.py
similarity index 100%
rename from lit-test/compiler/integration/arithmetics.py
rename to lit-test/test/integration/arithmetics.py
diff --git a/lit-test/compiler/integration/attribute.py b/lit-test/test/integration/attribute.py
similarity index 100%
rename from lit-test/compiler/integration/attribute.py
rename to lit-test/test/integration/attribute.py
diff --git a/lit-test/compiler/integration/bool.py b/lit-test/test/integration/bool.py
similarity index 100%
rename from lit-test/compiler/integration/bool.py
rename to lit-test/test/integration/bool.py
diff --git a/lit-test/compiler/integration/builtin.py b/lit-test/test/integration/builtin.py
similarity index 100%
rename from lit-test/compiler/integration/builtin.py
rename to lit-test/test/integration/builtin.py
diff --git a/lit-test/compiler/integration/compare.py b/lit-test/test/integration/compare.py
similarity index 100%
rename from lit-test/compiler/integration/compare.py
rename to lit-test/test/integration/compare.py
diff --git a/lit-test/compiler/integration/for.py b/lit-test/test/integration/for.py
similarity index 100%
rename from lit-test/compiler/integration/for.py
rename to lit-test/test/integration/for.py
diff --git a/lit-test/compiler/integration/function.py b/lit-test/test/integration/function.py
similarity index 100%
rename from lit-test/compiler/integration/function.py
rename to lit-test/test/integration/function.py
diff --git a/lit-test/compiler/integration/if.py b/lit-test/test/integration/if.py
similarity index 100%
rename from lit-test/compiler/integration/if.py
rename to lit-test/test/integration/if.py
diff --git a/lit-test/compiler/integration/lambda.py b/lit-test/test/integration/lambda.py
similarity index 100%
rename from lit-test/compiler/integration/lambda.py
rename to lit-test/test/integration/lambda.py
diff --git a/lit-test/compiler/integration/list.py b/lit-test/test/integration/list.py
similarity index 100%
rename from lit-test/compiler/integration/list.py
rename to lit-test/test/integration/list.py
diff --git a/lit-test/compiler/integration/locals.py b/lit-test/test/integration/locals.py
similarity index 100%
rename from lit-test/compiler/integration/locals.py
rename to lit-test/test/integration/locals.py
diff --git a/lit-test/compiler/integration/print.py b/lit-test/test/integration/print.py
similarity index 100%
rename from lit-test/compiler/integration/print.py
rename to lit-test/test/integration/print.py
diff --git a/lit-test/compiler/integration/subscript.py b/lit-test/test/integration/subscript.py
similarity index 100%
rename from lit-test/compiler/integration/subscript.py
rename to lit-test/test/integration/subscript.py
diff --git a/lit-test/compiler/integration/tuple.py b/lit-test/test/integration/tuple.py
similarity index 100%
rename from lit-test/compiler/integration/tuple.py
rename to lit-test/test/integration/tuple.py
diff --git a/lit-test/compiler/integration/while.py b/lit-test/test/integration/while.py
similarity index 100%
rename from lit-test/compiler/integration/while.py
rename to lit-test/test/integration/while.py
diff --git a/lit-test/lit.cfg b/lit-test/test/lit.cfg
similarity index 53%
rename from lit-test/lit.cfg
rename to lit-test/test/lit.cfg
index 398164291..4662ffcc2 100644
--- a/lit-test/lit.cfg
+++ b/lit-test/test/lit.cfg
@@ -1,12 +1,13 @@
+import os, subprocess
 import lit.util
 import lit.formats
 
+root = os.path.join(os.path.dirname(__file__), '..')
+
 config.name = 'ARTIQ'
 config.test_format = lit.formats.ShTest()
 config.suffixes = ['.py']
-config.excludes = ['harness.py']
-config.test_source_root = os.path.dirname(__file__)
 
 python_executable = 'python3'
-harness = '{} {}'.format(python_executable, os.path.join(config.test_source_root, 'harness.py'))
+harness = '{} {}'.format(python_executable, os.path.join(root, 'harness.py'))
 config.substitutions.append( ('%python', harness) )
diff --git a/lit-test/compiler/local_access/invalid.py b/lit-test/test/local_access/invalid.py
similarity index 100%
rename from lit-test/compiler/local_access/invalid.py
rename to lit-test/test/local_access/invalid.py
diff --git a/lit-test/compiler/local_access/valid.py b/lit-test/test/local_access/valid.py
similarity index 100%
rename from lit-test/compiler/local_access/valid.py
rename to lit-test/test/local_access/valid.py
diff --git a/lit-test/compiler/monomorphism/error_notmono.py b/lit-test/test/monomorphism/error_notmono.py
similarity index 100%
rename from lit-test/compiler/monomorphism/error_notmono.py
rename to lit-test/test/monomorphism/error_notmono.py
diff --git a/lit-test/compiler/monomorphism/integers.py b/lit-test/test/monomorphism/integers.py
similarity index 100%
rename from lit-test/compiler/monomorphism/integers.py
rename to lit-test/test/monomorphism/integers.py