diff --git a/tests/test_codegen.py b/tests/tsfc/test_codegen.py
similarity index 100%
rename from tests/test_codegen.py
rename to tests/tsfc/test_codegen.py
diff --git a/tests/test_coffee_optimise.py b/tests/tsfc/test_coffee_optimise.py
similarity index 100%
rename from tests/test_coffee_optimise.py
rename to tests/tsfc/test_coffee_optimise.py
diff --git a/tests/test_create_fiat_element.py b/tests/tsfc/test_create_fiat_element.py
similarity index 100%
rename from tests/test_create_fiat_element.py
rename to tests/tsfc/test_create_fiat_element.py
diff --git a/tests/test_create_finat_element.py b/tests/tsfc/test_create_finat_element.py
similarity index 100%
rename from tests/test_create_finat_element.py
rename to tests/tsfc/test_create_finat_element.py
diff --git a/tests/test_delta_elimination.py b/tests/tsfc/test_delta_elimination.py
similarity index 100%
rename from tests/test_delta_elimination.py
rename to tests/tsfc/test_delta_elimination.py
diff --git a/tests/test_dual_evaluation.py b/tests/tsfc/test_dual_evaluation.py
similarity index 100%
rename from tests/test_dual_evaluation.py
rename to tests/tsfc/test_dual_evaluation.py
diff --git a/tests/test_estimated_degree.py b/tests/tsfc/test_estimated_degree.py
similarity index 100%
rename from tests/test_estimated_degree.py
rename to tests/tsfc/test_estimated_degree.py
diff --git a/tests/test_firedrake_972.py b/tests/tsfc/test_firedrake_972.py
similarity index 100%
rename from tests/test_firedrake_972.py
rename to tests/tsfc/test_firedrake_972.py
diff --git a/tests/test_flexibly_indexed.py b/tests/tsfc/test_flexibly_indexed.py
similarity index 100%
rename from tests/test_flexibly_indexed.py
rename to tests/tsfc/test_flexibly_indexed.py
diff --git a/tests/test_flop_count.py b/tests/tsfc/test_flop_count.py
similarity index 100%
rename from tests/test_flop_count.py
rename to tests/tsfc/test_flop_count.py
diff --git a/tests/test_gem_failure.py b/tests/tsfc/test_gem_failure.py
similarity index 100%
rename from tests/test_gem_failure.py
rename to tests/tsfc/test_gem_failure.py
diff --git a/tests/test_geometry.py b/tests/tsfc/test_geometry.py
similarity index 100%
rename from tests/test_geometry.py
rename to tests/tsfc/test_geometry.py
diff --git a/tests/test_idempotency.py b/tests/tsfc/test_idempotency.py
similarity index 100%
rename from tests/test_idempotency.py
rename to tests/tsfc/test_idempotency.py
diff --git a/tests/test_impero_loopy_flop_counts.py b/tests/tsfc/test_impero_loopy_flop_counts.py
similarity index 100%
rename from tests/test_impero_loopy_flop_counts.py
rename to tests/tsfc/test_impero_loopy_flop_counts.py
diff --git a/tests/test_interpolation_factorisation.py b/tests/tsfc/test_interpolation_factorisation.py
similarity index 100%
rename from tests/test_interpolation_factorisation.py
rename to tests/tsfc/test_interpolation_factorisation.py
diff --git a/tests/test_pickle_gem.py b/tests/tsfc/test_pickle_gem.py
similarity index 100%
rename from tests/test_pickle_gem.py
rename to tests/tsfc/test_pickle_gem.py
diff --git a/tests/test_refactorise.py b/tests/tsfc/test_refactorise.py
similarity index 100%
rename from tests/test_refactorise.py
rename to tests/tsfc/test_refactorise.py
diff --git a/tests/test_simplification.py b/tests/tsfc/test_simplification.py
similarity index 100%
rename from tests/test_simplification.py
rename to tests/tsfc/test_simplification.py
diff --git a/tests/test_sum_factorisation.py b/tests/tsfc/test_sum_factorisation.py
similarity index 100%
rename from tests/test_sum_factorisation.py
rename to tests/tsfc/test_sum_factorisation.py
diff --git a/tests/test_syntax_sugar.py b/tests/tsfc/test_syntax_sugar.py
similarity index 100%
rename from tests/test_syntax_sugar.py
rename to tests/tsfc/test_syntax_sugar.py
diff --git a/tests/test_tensor.py b/tests/tsfc/test_tensor.py
similarity index 100%
rename from tests/test_tensor.py
rename to tests/tsfc/test_tensor.py
diff --git a/tests/test_tsfc_182.py b/tests/tsfc/test_tsfc_182.py
similarity index 100%
rename from tests/test_tsfc_182.py
rename to tests/tsfc/test_tsfc_182.py
diff --git a/tests/test_tsfc_204.py b/tests/tsfc/test_tsfc_204.py
similarity index 100%
rename from tests/test_tsfc_204.py
rename to tests/tsfc/test_tsfc_204.py
diff --git a/tests/test_tsfc_274.py b/tests/tsfc/test_tsfc_274.py
similarity index 100%
rename from tests/test_tsfc_274.py
rename to tests/tsfc/test_tsfc_274.py
diff --git a/tests/test_underintegration.py b/tests/tsfc/test_underintegration.py
similarity index 100%
rename from tests/test_underintegration.py
rename to tests/tsfc/test_underintegration.py