diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index 209a62e0..bb636f8f 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -189,12 +189,17 @@ namespace sqlpp
 		using _consistency_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
 					typename Policies::template _base_t<_policies_t>::_consistency_check..., 
 					typename _policies_t::_table_check>;
-		using _prepare_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
-					typename _policies_t::_cte_check, 
-					_consistency_check>;
+
 		using _run_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
 					typename _policies_t::_parameter_check, 
-					_prepare_check>;
+					typename _policies_t::_cte_check, 
+					typename Policies::template _base_t<_policies_t>::_consistency_check..., 
+					typename _policies_t::_table_check>;
+
+		using _prepare_check = detail::get_first_if<is_inconsistent_t, consistent_t,
+					typename _policies_t::_cte_check, 
+					typename Policies::template _base_t<_policies_t>::_consistency_check..., 
+					typename _policies_t::_table_check>;
 
 		using _result_type_provider = typename _policies_t::_result_type_provider;
 		template<typename Composite>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 74505083..537f20b4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,18 +6,18 @@ macro (build_and_run arg)
 	add_test("${arg}" "${arg}")
 endmacro ()
 
-#build_and_run(BooleanExpressionTest)
-#build_and_run(CustomQueryTest)
-#build_and_run(InterpretTest)
-#build_and_run(InsertTest)
-#build_and_run(RemoveTest)
-#build_and_run(UpdateTest)
-#build_and_run(SelectTest)
-#build_and_run(SelectTypeTest)
-#build_and_run(FunctionTest)
-#build_and_run(PreparedTest)
-#build_and_run(Minimalistic)
-#build_and_run(ResultTest)
+build_and_run(BooleanExpressionTest)
+build_and_run(CustomQueryTest)
+build_and_run(InterpretTest)
+build_and_run(InsertTest)
+build_and_run(RemoveTest)
+build_and_run(UpdateTest)
+build_and_run(SelectTest)
+build_and_run(SelectTypeTest)
+build_and_run(FunctionTest)
+build_and_run(PreparedTest)
+build_and_run(Minimalistic)
+build_and_run(ResultTest)
 build_and_run(UnionTest)
 build_and_run(WithTest)