diff --git a/CMakeLists.txt b/CMakeLists.txt
index c02c5051e..ba78fd322 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,9 +40,9 @@ else()
   )
 endif()
 
-if (CMAKE_VERSION VERSION_GREATER 3.2.3) 
+if (NOT CMAKE_VERSION VERSION_LESS 3.3.1) 
   # Detect Fortran compiler version directly
-  if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
+  if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
     add_definitions(-DPREFIX_NAME=_gfortran_caf_)
   else()
@@ -51,7 +51,7 @@ if (CMAKE_VERSION VERSION_GREATER 3.2.3)
   endif()
 else()
   # Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
-  if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 5.0.0))
+  if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
     add_definitions(-DPREFIX_NAME=_gfortran_caf_)
   else()
diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt
index db735974c..6eee6ecea 100644
--- a/src/mpi/CMakeLists.txt
+++ b/src/mpi/CMakeLists.txt
@@ -8,16 +8,16 @@ elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
   set(cray_compiler true)
 endif()
 
-if (CMAKE_VERSION VERSION_GREATER 3.2.3) 
+if (NOT CMAKE_VERSION VERSION_LESS 3.3.1) 
   # Detect Fortran compiler version directly
-  if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
+  if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
   else()
     set(opencoarrays_aware_compiler false)
   endif()
 else()
   # Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
-  if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 5.0.0))
+  if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
   else()
     set(opencoarrays_aware_compiler false)
diff --git a/src/tests/unit/extensions/CMakeLists.txt b/src/tests/unit/extensions/CMakeLists.txt
index 19c1e06ca..8c0ba7a72 100644
--- a/src/tests/unit/extensions/CMakeLists.txt
+++ b/src/tests/unit/extensions/CMakeLists.txt
@@ -2,16 +2,16 @@ if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   set(gfortran_compiler true)
 endif()
 
-if (CMAKE_VERSION VERSION_GREATER 3.2.3) 
+if (NOT CMAKE_VERSION VERSION_LESS 3.3.1) 
   # Detect Fortran compiler version directly
-  if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 4.9.2))
+  if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
   else()
     set(opencoarrays_aware_compiler false)
   endif()
 else()
   # Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
-  if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.9.2))
+  if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
     set(opencoarrays_aware_compiler true)
   else()
     set(opencoarrays_aware_compiler false)