diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4f8535c..f4ce73cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 project(yoga-all)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
index deb4b7a2..ff06fa1e 100644
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 project(benchmark)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index f1eac87e..d8afd671 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 project(yogajni)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
diff --git a/javascript/CMakeLists.txt b/javascript/CMakeLists.txt
index afb54bb5..15ea1e94 100644
--- a/javascript/CMakeLists.txt
+++ b/javascript/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 set(CMAKE_VERBOSE_MAKEFILE on)
 project(yoga)
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b25ddb0..c48bfb9f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 project(tests)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
@@ -15,7 +15,6 @@ set(YOGA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include(${YOGA_ROOT}/cmake/project-defaults.cmake)
 
 # Fetch GTest
-cmake_policy(SET CMP0135 NEW)
 FetchContent_Declare(
   googletest
   URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip
diff --git a/yoga/CMakeLists.txt b/yoga/CMakeLists.txt
index e51f3679..b6eca1ac 100644
--- a/yoga/CMakeLists.txt
+++ b/yoga/CMakeLists.txt
@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.26)
 project(yogacore)
 set(CMAKE_VERBOSE_MAKEFILE on)