diff --git a/test/aeso_compiler_tests.erl b/test/aeso_compiler_tests.erl
index 199ae26..a10c885 100644
--- a/test/aeso_compiler_tests.erl
+++ b/test/aeso_compiler_tests.erl
@@ -203,6 +203,17 @@ compilable_contracts() ->
      "polymorphism_contract_interface_same_decl_multi_interface",
      "polymorphism_contract_interface_same_name_same_type",
      "missing_init_fun_state_unit",
+     "complex_compare_leq",
+     "complex_compare",
+     "higher_order_compare",
+     "higher_order_map_keys",
+     "higher_order_state",
+     "polymorphic_compare",
+     "polymorphic_entrypoint",
+     "polymorphic_entrypoint_return",
+     "polymorphic_map_keys",
+     "unapplied_contract_call",
+     "unapplied_named_arg_builtin",
      "test" % Custom general-purpose test file. Keep it last on the list.
     ].
 
diff --git a/test/contracts/code_errors/complex_compare.aes b/test/contracts/complex_compare.aes
similarity index 100%
rename from test/contracts/code_errors/complex_compare.aes
rename to test/contracts/complex_compare.aes
diff --git a/test/contracts/code_errors/complex_compare_leq.aes b/test/contracts/complex_compare_leq.aes
similarity index 100%
rename from test/contracts/code_errors/complex_compare_leq.aes
rename to test/contracts/complex_compare_leq.aes
diff --git a/test/contracts/code_errors/higher_order_compare.aes b/test/contracts/higher_order_compare.aes
similarity index 100%
rename from test/contracts/code_errors/higher_order_compare.aes
rename to test/contracts/higher_order_compare.aes
diff --git a/test/contracts/code_errors/higher_order_map_keys.aes b/test/contracts/higher_order_map_keys.aes
similarity index 100%
rename from test/contracts/code_errors/higher_order_map_keys.aes
rename to test/contracts/higher_order_map_keys.aes
diff --git a/test/contracts/code_errors/higher_order_state.aes b/test/contracts/higher_order_state.aes
similarity index 100%
rename from test/contracts/code_errors/higher_order_state.aes
rename to test/contracts/higher_order_state.aes
diff --git a/test/contracts/code_errors/polymorphic_compare.aes b/test/contracts/polymorphic_compare.aes
similarity index 100%
rename from test/contracts/code_errors/polymorphic_compare.aes
rename to test/contracts/polymorphic_compare.aes
diff --git a/test/contracts/code_errors/polymorphic_entrypoint.aes b/test/contracts/polymorphic_entrypoint.aes
similarity index 100%
rename from test/contracts/code_errors/polymorphic_entrypoint.aes
rename to test/contracts/polymorphic_entrypoint.aes
diff --git a/test/contracts/code_errors/polymorphic_entrypoint_return.aes b/test/contracts/polymorphic_entrypoint_return.aes
similarity index 100%
rename from test/contracts/code_errors/polymorphic_entrypoint_return.aes
rename to test/contracts/polymorphic_entrypoint_return.aes
diff --git a/test/contracts/code_errors/polymorphic_map_keys.aes b/test/contracts/polymorphic_map_keys.aes
similarity index 100%
rename from test/contracts/code_errors/polymorphic_map_keys.aes
rename to test/contracts/polymorphic_map_keys.aes
diff --git a/test/contracts/code_errors/unapplied_contract_call.aes b/test/contracts/unapplied_contract_call.aes
similarity index 100%
rename from test/contracts/code_errors/unapplied_contract_call.aes
rename to test/contracts/unapplied_contract_call.aes
diff --git a/test/contracts/code_errors/unapplied_named_arg_builtin.aes b/test/contracts/unapplied_named_arg_builtin.aes
similarity index 100%
rename from test/contracts/code_errors/unapplied_named_arg_builtin.aes
rename to test/contracts/unapplied_named_arg_builtin.aes