diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3335039..1dca16c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(fastor VERSION 0.6.4)
 
-option(BUILD_TESTING "Build the testing tree." ON)
+if(PROJECT_IS_TOP_LEVEL)
+	option(FASTOR_BUILD_TESTING "Build the testing tree." ON)
+endif()
 
 set(FASTOR_SOURCE_DIR "${fastor_SOURCE_DIR}")
 set(FASTOR_BINARY_DIR "${fastor_BINARY_DIR}")
@@ -21,9 +23,8 @@ target_include_directories(
         $<BUILD_INTERFACE:${FASTOR_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:${FASTOR_INSTALL_INCLUDE_DIR}>)
 
-if(BUILD_TESTING)
+if(FASTOR_BUILD_TESTING)
     enable_testing()
-
     add_subdirectory(tests)
 endif()
 
diff --git a/benchmark/benchmark_finite_difference/CMakeLists.txt b/benchmark/benchmark_finite_difference/CMakeLists.txt
index 9ef75ef..d6631e6 100644
--- a/benchmark/benchmark_finite_difference/CMakeLists.txt
+++ b/benchmark/benchmark_finite_difference/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.21)
 project(benchmark_finite_difference)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/benchmark/benchmark_material/CMakeLists.txt b/benchmark/benchmark_material/CMakeLists.txt
index 4a12bda..38420e7 100644
--- a/benchmark/benchmark_material/CMakeLists.txt
+++ b/benchmark/benchmark_material/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.21)
 project(benchmark_material)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 89788a0..b63e4f0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,12 +1,10 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_fastor)
 
 set(FASTOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 set(CMAKE_CXX_STANDARD 14)
 
-enable_testing()
-
 if(MSVC)
     add_compile_options("/std:c++17" "/W2" "$<$<CONFIG:RELEASE>:/O2>")
 else()
diff --git a/tests/test_auxiliary_funcs/CMakeLists.txt b/tests/test_auxiliary_funcs/CMakeLists.txt
index 794c0de..8b1b19a 100644
--- a/tests/test_auxiliary_funcs/CMakeLists.txt
+++ b/tests/test_auxiliary_funcs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_auxiliary_funcs)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_binary_cmp_ops/CMakeLists.txt b/tests/test_binary_cmp_ops/CMakeLists.txt
index 6045a55..7c04fb2 100644
--- a/tests/test_binary_cmp_ops/CMakeLists.txt
+++ b/tests/test_binary_cmp_ops/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_binary_cmp_ops)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_booleans/CMakeLists.txt b/tests/test_booleans/CMakeLists.txt
index 8985c75..d0226f9 100644
--- a/tests/test_booleans/CMakeLists.txt
+++ b/tests/test_booleans/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_booleans)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_complex_expressions/CMakeLists.txt b/tests/test_complex_expressions/CMakeLists.txt
index 7f2dded..2a8d8d5 100644
--- a/tests/test_complex_expressions/CMakeLists.txt
+++ b/tests/test_complex_expressions/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_complex_expressions)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_einsum/CMakeLists.txt b/tests/test_einsum/CMakeLists.txt
index dfbbed0..198f4ed 100644
--- a/tests/test_einsum/CMakeLists.txt
+++ b/tests/test_einsum/CMakeLists.txt
@@ -1,10 +1,8 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_einsum)
 
 set(CMAKE_CXX_STANDARD 14)
 
-enable_testing()
-
 # single einsum
 # MSVC gives superfluous errors
 if(NOT MSVC)
diff --git a/tests/test_einsum_explicit/CMakeLists.txt b/tests/test_einsum_explicit/CMakeLists.txt
index af152f1..c5f5e1d 100644
--- a/tests/test_einsum_explicit/CMakeLists.txt
+++ b/tests/test_einsum_explicit/CMakeLists.txt
@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_einsum)
 
 set(CMAKE_CXX_STANDARD 17)
 
-enable_testing()
 
 # explicit einsum
 # single expressions
diff --git a/tests/test_fixed_views_1d/CMakeLists.txt b/tests/test_fixed_views_1d/CMakeLists.txt
index 6ebc17e..83ed60b 100644
--- a/tests/test_fixed_views_1d/CMakeLists.txt
+++ b/tests/test_fixed_views_1d/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_fixed_views_1d)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_fixed_views_2d/CMakeLists.txt b/tests/test_fixed_views_2d/CMakeLists.txt
index 0b88e29..f191b33 100644
--- a/tests/test_fixed_views_2d/CMakeLists.txt
+++ b/tests/test_fixed_views_2d/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_fixed_views_2d)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_fixed_views_nd/CMakeLists.txt b/tests/test_fixed_views_nd/CMakeLists.txt
index 48eb01f..9c4e7e8 100644
--- a/tests/test_fixed_views_nd/CMakeLists.txt
+++ b/tests/test_fixed_views_nd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_fixed_views_nd)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_inverse/CMakeLists.txt b/tests/test_inverse/CMakeLists.txt
index 14da536..2978471 100644
--- a/tests/test_inverse/CMakeLists.txt
+++ b/tests/test_inverse/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_inverse)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_linalg/CMakeLists.txt b/tests/test_linalg/CMakeLists.txt
index 7cfae6a..1eae20c 100644
--- a/tests/test_linalg/CMakeLists.txt
+++ b/tests/test_linalg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_linalg)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_lu/CMakeLists.txt b/tests/test_lu/CMakeLists.txt
index 3e242b8..31c2264 100644
--- a/tests/test_lu/CMakeLists.txt
+++ b/tests/test_lu/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_lu)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_math_functions/CMakeLists.txt b/tests/test_math_functions/CMakeLists.txt
index d811973..c80cec4 100644
--- a/tests/test_math_functions/CMakeLists.txt
+++ b/tests/test_math_functions/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_math_functions)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_matmul/CMakeLists.txt b/tests/test_matmul/CMakeLists.txt
index 17aecc6..878a4fb 100644
--- a/tests/test_matmul/CMakeLists.txt
+++ b/tests/test_matmul/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_matmul)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_mixed_views/CMakeLists.txt b/tests/test_mixed_views/CMakeLists.txt
index 969567f..55c5491 100644
--- a/tests/test_mixed_views/CMakeLists.txt
+++ b/tests/test_mixed_views/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_mixed_views)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_numerics/CMakeLists.txt b/tests/test_numerics/CMakeLists.txt
index 59b70d4..8e8ee82 100644
--- a/tests/test_numerics/CMakeLists.txt
+++ b/tests/test_numerics/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_numerics)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_permute/CMakeLists.txt b/tests/test_permute/CMakeLists.txt
index 58807ae..8b26634 100644
--- a/tests/test_permute/CMakeLists.txt
+++ b/tests/test_permute/CMakeLists.txt
@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_permute)
 
 set(CMAKE_CXX_STANDARD 14)
 
-enable_testing()
 
 # default recursive CXX14
 add_executable(test_permute_1 test_permute.cpp)
diff --git a/tests/test_qr/CMakeLists.txt b/tests/test_qr/CMakeLists.txt
index 43fb055..85fcb30 100644
--- a/tests/test_qr/CMakeLists.txt
+++ b/tests/test_qr/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_qr)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_random_views/CMakeLists.txt b/tests/test_random_views/CMakeLists.txt
index d6af91c..62660c4 100644
--- a/tests/test_random_views/CMakeLists.txt
+++ b/tests/test_random_views/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_random_views)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_simd_vectors/CMakeLists.txt b/tests/test_simd_vectors/CMakeLists.txt
index fd28888..36f53fc 100644
--- a/tests/test_simd_vectors/CMakeLists.txt
+++ b/tests/test_simd_vectors/CMakeLists.txt
@@ -1,11 +1,8 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_simd_vectors)
 
 set(CMAKE_CXX_STANDARD 14)
 
-enable_testing()
-
-
 add_executable(test_simd_vectors test_simd_vectors.cpp)
 add_test(test_simd_vectors test_simd_vectors)
 
@@ -30,4 +27,4 @@ else()
 endif()
 
 target_include_directories(test_simd_vectors_complex PRIVATE ${FASTOR_INCLUDE_DIR})
-target_include_directories(test_simd_vectors_complex PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
\ No newline at end of file
+target_include_directories(test_simd_vectors_complex PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
diff --git a/tests/test_solve/CMakeLists.txt b/tests/test_solve/CMakeLists.txt
index bdc3e6e..1f3ac17 100644
--- a/tests/test_solve/CMakeLists.txt
+++ b/tests/test_solve/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_solve)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_tensor_basics/CMakeLists.txt b/tests/test_tensor_basics/CMakeLists.txt
index fcee24c..c37ba05 100644
--- a/tests/test_tensor_basics/CMakeLists.txt
+++ b/tests/test_tensor_basics/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_tensor_basics)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_tensormap/CMakeLists.txt b/tests/test_tensormap/CMakeLists.txt
index b306b0d..3d012ad 100644
--- a/tests/test_tensormap/CMakeLists.txt
+++ b/tests/test_tensormap/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_tensormap)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_tmatmul/CMakeLists.txt b/tests/test_tmatmul/CMakeLists.txt
index 8c704f8..6120881 100644
--- a/tests/test_tmatmul/CMakeLists.txt
+++ b/tests/test_tmatmul/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_tmatmul)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_transpose/CMakeLists.txt b/tests/test_transpose/CMakeLists.txt
index 102dd43..1b745f1 100644
--- a/tests/test_transpose/CMakeLists.txt
+++ b/tests/test_transpose/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_transpose)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_unary_bool_ops/CMakeLists.txt b/tests/test_unary_bool_ops/CMakeLists.txt
index e4a19a1..4c671fe 100644
--- a/tests/test_unary_bool_ops/CMakeLists.txt
+++ b/tests/test_unary_bool_ops/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_unary_bool_ops)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_views_1d/CMakeLists.txt b/tests/test_views_1d/CMakeLists.txt
index d1accf9..5c4bc64 100644
--- a/tests/test_views_1d/CMakeLists.txt
+++ b/tests/test_views_1d/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_views_1d)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_views_2d/CMakeLists.txt b/tests/test_views_2d/CMakeLists.txt
index 35e8010..0d03c7a 100644
--- a/tests/test_views_2d/CMakeLists.txt
+++ b/tests/test_views_2d/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_views_2d)
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/tests/test_views_nd/CMakeLists.txt b/tests/test_views_nd/CMakeLists.txt
index b0f06cd..326946c 100644
--- a/tests/test_views_nd/CMakeLists.txt
+++ b/tests/test_views_nd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 project(test_views_nd)
 
 set(CMAKE_CXX_STANDARD 14)