diff --git a/CMakeLists.txt b/CMakeLists.txt
index e164d35ef..747a95fe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,7 +237,7 @@ option(ENABLE_SHARED_LIBRARY_VERSION "Encode the library SO version in the file
 if(CMAKE_COMPILER_IS_GNUCC OR APPLE)
   option(NETCDF_ENABLE_COVERAGE_TESTS "Enable compiler flags needed to perform coverage tests." OFF)
   option(NETCDF_ENABLE_CONVERSION_WARNINGS "Enable warnings for implicit conversion from 64 to 32-bit datatypes." ON)
-  option(ENABLE_LARGE_FILE_TESTS "Enable large file tests." OFF)
+  option(NETCDF_ENABLE_LARGE_FILE_TESTS "Enable large file tests." OFF)
 
   # Debugging flags
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
@@ -814,7 +814,7 @@ if(NETCDF_ENABLE_EXTREME_NUMBERS)
 endif()
 
 # Enable Large file tests
-if(ENABLE_LARGE_FILE_TESTS)
+if(NETCDF_ENABLE_LARGE_FILE_TESTS)
   set(LARGE_FILE_TESTS ON)
 endif()
 
diff --git a/cmake/netcdf_functions_macros.cmake b/cmake/netcdf_functions_macros.cmake
index 8ae43e93b..049c21691 100644
--- a/cmake/netcdf_functions_macros.cmake
+++ b/cmake/netcdf_functions_macros.cmake
@@ -242,7 +242,7 @@ macro(print_conf_summary)
     message(STATUS "Extra Tests:       ${NETCDF_ENABLE_EXTRA_TESTS}")
     message(STATUS "Coverage Tests:    ${NETCDF_ENABLE_COVERAGE_TESTS}")
     message(STATUS "Parallel Tests:    ${ENABLE_PARALLEL_TESTS}")
-    message(STATUS "Large File Tests:  ${ENABLE_LARGE_FILE_TESTS}")
+    message(STATUS "Large File Tests:  ${NETCDF_ENABLE_LARGE_FILE_TESTS}")
     message(STATUS "Extreme Numbers:   ${NETCDF_ENABLE_EXTREME_NUMBERS}")
     message(STATUS "Unit Tests:        ${ENABLE_UNIT_TESTS}")
   endif()
diff --git a/ctest_scripts/ctest_mpicc.ctest b/ctest_scripts/ctest_mpicc.ctest
index bc829871e..7abea305b 100644
--- a/ctest_scripts/ctest_mpicc.ctest
+++ b/ctest_scripts/ctest_mpicc.ctest
@@ -34,7 +34,7 @@ find_program(CTEST_GIT_COMMAND NAMES git)
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 
-set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE -DCMAKE_C_COMPILER=${CTEST_COMPILER}")
+set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DNETCDF_ENABLE_LARGE_FILE_TESTS=FALSE -DCMAKE_C_COMPILER=${CTEST_COMPILER}")
 
 
 set(CTEST_DROP_METHOD https)
diff --git a/ctest_scripts/ctest_serial.ctest b/ctest_scripts/ctest_serial.ctest
index 95f0bb724..06495645f 100644
--- a/ctest_scripts/ctest_serial.ctest
+++ b/ctest_scripts/ctest_serial.ctest
@@ -33,7 +33,7 @@ find_program(CTEST_GIT_COMMAND NAMES git)
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 
-set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=FALSE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE")
+set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=FALSE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DNETCDF_ENABLE_LARGE_FILE_TESTS=FALSE")
 
 
 set(CTEST_DROP_METHOD https)
diff --git a/ctest_scripts/ctest_serial_coverage.ctest b/ctest_scripts/ctest_serial_coverage.ctest
index 9d71e6949..1794e2f27 100644
--- a/ctest_scripts/ctest_serial_coverage.ctest
+++ b/ctest_scripts/ctest_serial_coverage.ctest
@@ -33,7 +33,7 @@ find_program(CTEST_GIT_COMMAND NAMES git)
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 
-set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE")
+set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DNETCDF_ENABLE_LARGE_FILE_TESTS=FALSE")
 
 
 set(CTEST_DROP_METHOD https)
diff --git a/ctest_scripts/ctest_serial_dap.ctest b/ctest_scripts/ctest_serial_dap.ctest
index 98062054e..55fea86b0 100644
--- a/ctest_scripts/ctest_serial_dap.ctest
+++ b/ctest_scripts/ctest_serial_dap.ctest
@@ -33,7 +33,7 @@ find_program(CTEST_GIT_COMMAND NAMES git)
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 
-set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE -DNETCDF_ENABLE_DAP_REMOTE_TESTS=TRUE")
+set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DNETCDF_ENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DNETCDF_ENABLE_LARGE_FILE_TESTS=FALSE -DNETCDF_ENABLE_DAP_REMOTE_TESTS=TRUE")
 
 
 set(CTEST_DROP_METHOD https)
diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt
index 0fad5d853..08df34af4 100644
--- a/ncdump/CMakeLists.txt
+++ b/ncdump/CMakeLists.txt
@@ -281,9 +281,9 @@ endif()
   # The following test script invokes
   # gcc directly.
   if(CMAKE_COMPILER_IS_GNUCC OR APPLE)
-    if(ENABLE_LARGE_FILE_TESTS)
+    if(NETCDF_ENABLE_LARGE_FILE_TESTS)
       add_sh_test(ncdump tst_iter)
-    endif(ENABLE_LARGE_FILE_TESTS)
+    endif(NETCDF_ENABLE_LARGE_FILE_TESTS)
   endif(CMAKE_COMPILER_IS_GNUCC OR APPLE)
 
   ###