diff --git a/CMakeLists.txt b/CMakeLists.txt
index c771264ff36..56d61d438cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 #-------------------------------------------------------------------------------
 # Project description
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.16...3.30 FATAL_ERROR)
 
 project( XRootD )
 
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index c6a77f5aa0d..04a273d827c 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.16...3.30 FATAL_ERROR)
 
 project(PyXRootD LANGUAGES CXX)
 
diff --git a/test.cmake b/test.cmake
index 64aa686ee71..f20fe8eb6ac 100644
--- a/test.cmake
+++ b/test.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.30 FATAL_ERROR)
 
 set(ENV{LANG} "C")
 set(ENV{LC_ALL} "C")