diff --git a/tests/core/compat/CMakeLists.txt b/tests/core/compat/CMakeLists.txt
index 3441a1ff..6d9d21b8 100644
--- a/tests/core/compat/CMakeLists.txt
+++ b/tests/core/compat/CMakeLists.txt
@@ -27,12 +27,6 @@ function(test_compile name)
     set(target sqlpp11_compat_${name})
     add_executable(${target} ${name}.cpp)
     target_link_libraries(${target} PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
-    # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET sqlpp11_compat_${name} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET sqlpp11_compat_${name} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET sqlpp11_compat_${name} PROPERTY CXX_EXTENSIONS no)
-    endif()
 endfunction()
 
 test_compile(make_unique)
diff --git a/tests/core/constraints/CMakeLists.txt b/tests/core/constraints/CMakeLists.txt
index 4e868a3e..d0fdb946 100644
--- a/tests/core/constraints/CMakeLists.txt
+++ b/tests/core/constraints/CMakeLists.txt
@@ -31,12 +31,6 @@ function(test_constraint name pattern)
         COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}
     )
     set_property(TEST ${test} PROPERTY PASS_REGULAR_EXPRESSION ${pattern})
-    # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET ${target} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET ${target} PROPERTY CXX_EXTENSIONS no)
-    endif()
 endfunction()
 
 # Compiling these is required to fail (testing some static_assert)
@@ -44,4 +38,4 @@ test_constraint(count_of_count "count\\(\\) cannot be used on an aggregate funct
 test_constraint(max_of_max "max\\(\\) cannot be used on an aggregate function")
 test_constraint(require_insert "required column is missing")
 test_constraint(must_not_insert "one assignment is prohibited")
-test_constraint(must_not_update "one assignment is prohibited")
\ No newline at end of file
+test_constraint(must_not_update "one assignment is prohibited")
diff --git a/tests/core/serialize/CMakeLists.txt b/tests/core/serialize/CMakeLists.txt
index 1627c069..4c2f4e86 100644
--- a/tests/core/serialize/CMakeLists.txt
+++ b/tests/core/serialize/CMakeLists.txt
@@ -60,13 +60,6 @@ create_test_sourcelist(test_sources test_serializer_main.cpp ${test_files})
 add_executable(sqlpp11_core_serialize ${test_sources})
 target_link_libraries(sqlpp11_core_serialize PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_core_serialize PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_core_serialize PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_core_serialize PROPERTY CXX_EXTENSIONS no)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.core.serialize.${test}
diff --git a/tests/core/static_asserts/CMakeLists.txt b/tests/core/static_asserts/CMakeLists.txt
index f01aea41..12d56532 100644
--- a/tests/core/static_asserts/CMakeLists.txt
+++ b/tests/core/static_asserts/CMakeLists.txt
@@ -26,12 +26,6 @@ function(test_compile name)
     set(target sqlpp11_assert_${name})
     add_executable(${target} ${name}.cpp)
     target_link_libraries(${target} PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
-    # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET sqlpp11_assert_${name} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET sqlpp11_assert_${name} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET sqlpp11_assert_${name} PROPERTY CXX_EXTENSIONS no)
-    endif()  
 endfunction()
 
 test_compile(aggregates)
@@ -47,4 +41,4 @@ test_compile(date)
 test_compile(date_time)
 test_compile(text)
 test_compile(no_self_compare)
-test_compile(unwrapped_bool)
\ No newline at end of file
+test_compile(unwrapped_bool)
diff --git a/tests/core/types/CMakeLists.txt b/tests/core/types/CMakeLists.txt
index e260ba8c..4471570c 100644
--- a/tests/core/types/CMakeLists.txt
+++ b/tests/core/types/CMakeLists.txt
@@ -27,11 +27,6 @@ function(test_compile name)
     add_executable(${target} ${name}.cpp)
     target_link_libraries(${target} PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
     # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_EXTENSIONS no)
-    endif()
 endfunction()
 
 add_subdirectory(operator)
diff --git a/tests/core/types/operator/CMakeLists.txt b/tests/core/types/operator/CMakeLists.txt
index ff1c1a34..b56e1f45 100644
--- a/tests/core/types/operator/CMakeLists.txt
+++ b/tests/core/types/operator/CMakeLists.txt
@@ -23,15 +23,9 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 function(test_compile name)
-    set(target sqlpp11_${name})
+    set(target sqlpp11_types_operator_${name})
     add_executable(${target} ${name}.cpp)
     target_link_libraries(${target} PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
-    # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET sqlpp11_${name} PROPERTY CXX_EXTENSIONS no)
-    endif()
 endfunction()
 
 test_compile(any)
diff --git a/tests/core/usage/CMakeLists.txt b/tests/core/usage/CMakeLists.txt
index 93770454..df1fea70 100644
--- a/tests/core/usage/CMakeLists.txt
+++ b/tests/core/usage/CMakeLists.txt
@@ -57,12 +57,6 @@ endif()
 create_test_sourcelist(test_sources test_main.cpp ${test_files})
 add_executable(sqlpp11_core_tests ${test_sources})
 target_link_libraries(sqlpp11_core_tests PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_core_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_core_tests PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_core_tests PROPERTY CXX_EXTENSIONS no)
-endif()
 
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
diff --git a/tests/mysql/serialize/CMakeLists.txt b/tests/mysql/serialize/CMakeLists.txt
index 422a27fa..ad2ca144 100644
--- a/tests/mysql/serialize/CMakeLists.txt
+++ b/tests/mysql/serialize/CMakeLists.txt
@@ -36,13 +36,6 @@ if(NOT MSVC)
     target_compile_options(sqlpp11_mysql_serialize_tests PRIVATE -Wall -Wextra -pedantic)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_mysql_serialize_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_mysql_serialize_tests PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_mysql_serialize_tests PROPERTY CXX_EXTENSIONS no)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.mysql.serialize.${test}
diff --git a/tests/mysql/usage/CMakeLists.txt b/tests/mysql/usage/CMakeLists.txt
index a154f43d..f4f97b76 100644
--- a/tests/mysql/usage/CMakeLists.txt
+++ b/tests/mysql/usage/CMakeLists.txt
@@ -52,13 +52,6 @@ if(NOT MSVC)
     target_compile_options(sqlpp11_mysql_tests PRIVATE -Wall -Wextra -pedantic)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_mysql_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_mysql_tests PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_mysql_tests PROPERTY CXX_EXTENSIONS no)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.mysql.usage.${test}
diff --git a/tests/postgresql/constraints/CMakeLists.txt b/tests/postgresql/constraints/CMakeLists.txt
index 4f671291..1b668304 100644
--- a/tests/postgresql/constraints/CMakeLists.txt
+++ b/tests/postgresql/constraints/CMakeLists.txt
@@ -31,12 +31,6 @@ function(test_constraint name pattern)
         COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}
     )
     set_property(TEST ${test} PROPERTY PASS_REGULAR_EXPRESSION ${pattern})
-    # conditionally bump to a higher C++ standard to test compatibility
-    if (SQLPP11_TESTS_CXX_STD)
-        set_property(TARGET ${target} PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-        set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED yes)
-        set_property(TARGET ${target} PROPERTY CXX_EXTENSIONS no)
-    endif()
 endfunction()
 
 # Compiling these is required to fail (testing some static_assert)
@@ -48,4 +42,4 @@ test_constraint(OnConflictMissingAction "either do_nothing\\(\\) or do_update\\(
 test_constraint(OnConflictMissingAssignmentsDoUpdate "conflict_target specification is required with do_update")
 test_constraint(OnConflictMissingParameterDoUpdate "conflict_target specification is required with do_update")
 test_constraint(ReturningEmptyAssert "at least one returnable expression")
-test_constraint(ReturningInvalidArgument "at least one returning column requires a table which is otherwise not known in the statement")
\ No newline at end of file
+test_constraint(ReturningInvalidArgument "at least one returning column requires a table which is otherwise not known in the statement")
diff --git a/tests/postgresql/serialize/CMakeLists.txt b/tests/postgresql/serialize/CMakeLists.txt
index 190e8c86..d69597b4 100644
--- a/tests/postgresql/serialize/CMakeLists.txt
+++ b/tests/postgresql/serialize/CMakeLists.txt
@@ -33,13 +33,6 @@ if(NOT MSVC)
     target_compile_options(sqlpp11_postgresql_serialize_tests PRIVATE -Wall -Wextra -pedantic)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_postgresql_serialize_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_postgresql_serialize_tests PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_postgresql_serialize_tests PROPERTY CXX_EXTENSIONS no)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.postgresql.serialize.${test}
diff --git a/tests/postgresql/usage/CMakeLists.txt b/tests/postgresql/usage/CMakeLists.txt
index d4eafc88..6340f3d9 100644
--- a/tests/postgresql/usage/CMakeLists.txt
+++ b/tests/postgresql/usage/CMakeLists.txt
@@ -50,13 +50,6 @@ if(NOT MSVC)
     target_compile_options(sqlpp11_postgresql_tests PRIVATE -Wall -Wextra -pedantic)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_postgresql_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_postgresql_tests PROPERTY CXX_STANDARD_REQUIRED yes)
-    set_property(TARGET sqlpp11_postgresql_tests PROPERTY CXX_EXTENSIONS no)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.postgresql.usage.${test}
diff --git a/tests/sqlite3/serialize/CMakeLists.txt b/tests/sqlite3/serialize/CMakeLists.txt
index c0ff4fc1..ae27c2cf 100644
--- a/tests/sqlite3/serialize/CMakeLists.txt
+++ b/tests/sqlite3/serialize/CMakeLists.txt
@@ -39,13 +39,6 @@ else()
     target_link_libraries(sqlpp11_sqlite3_serialize_tests PRIVATE sqlpp11::sqlite3)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_sqlite3_serialize_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_sqlite3_serialize_tests PROPERTY CXX_STANDARD_REQUIRED ON)
-    set_property(TARGET sqlpp11_sqlite3_serialize_tests PROPERTY CXX_EXTENSIONS OFF)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.sqlite3.serialize.${test}
diff --git a/tests/sqlite3/usage/CMakeLists.txt b/tests/sqlite3/usage/CMakeLists.txt
index 55d2ca02..7b319121 100644
--- a/tests/sqlite3/usage/CMakeLists.txt
+++ b/tests/sqlite3/usage/CMakeLists.txt
@@ -56,13 +56,6 @@ else()
     target_link_libraries(sqlpp11_sqlite3_tests PRIVATE sqlpp11::sqlite3)
 endif()
 
-# conditionally bump to a higher C++ standard to test compatibility
-if (SQLPP11_TESTS_CXX_STD)
-    set_property(TARGET sqlpp11_sqlite3_tests PROPERTY CXX_STANDARD ${SQLPP11_TESTS_CXX_STD})
-    set_property(TARGET sqlpp11_sqlite3_tests PROPERTY CXX_STANDARD_REQUIRED ON)
-    set_property(TARGET sqlpp11_sqlite3_tests PROPERTY CXX_EXTENSIONS OFF)
-endif()
-
 foreach(test_file IN LISTS test_files)
     get_filename_component(test ${test_file} NAME_WLE)
     add_test(NAME sqlpp11.sqlite3.usage.${test}