diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c6df7668b..2b5ff7f1cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -946,6 +946,9 @@ if (BUILD_TESTING)
   if (HDF5_TEST_VFD)
     option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
     mark_as_advanced (HDF5_TEST_FHEAP_VFD)
+
+    # Initialize the list of VFDs to be used for testing and create a test folder for each VFD
+    H5_SET_VFD_LIST()
   endif ()
 
   option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF)
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
index d525bb51ba..4f3d137bbc 100644
--- a/c++/test/CMakeVFDTests.cmake
+++ b/c++/test/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index b3cf0159a8..1a0e8b3371 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -60,6 +60,7 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
   endif ()
 endmacro ()
 
+# Initialize the list of VFDs to be used for testing and create a test folder for each VFD
 macro (H5_SET_VFD_LIST)
   set (VFD_LIST
       sec2
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index e557676984..130b0bf481 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -17,8 +17,7 @@
 ##############################################################################
 # included from CMakeTests.cmake
 
-H5_SET_VFD_LIST()
-
+# create more test folders for each VFD
 foreach (vfdtest ${VFD_LIST})
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles")
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files")
diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake
index 4cda27baa3..12df1e90a4 100644
--- a/testpar/CMakeVFDTests.cmake
+++ b/testpar/CMakeVFDTests.cmake
@@ -21,8 +21,6 @@ set (H5P_VFD_TESTS
     t_pflush2
 )
 
-H5_SET_VFD_LIST()
-
 macro (ADD_VFD_TEST vfdname resultcode)
   if (NOT HDF5_ENABLE_USING_MEMCHECKER)
     foreach (h5_test ${H5P_VFD_TESTS})
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 6a70b85137..b6e0bea3cd 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 # --------------------------------------------------------------------
 # Copy all the HDF5 files from the source directory into the test directory
 # --------------------------------------------------------------------
diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake
index 78d752cef6..e50414f3cd 100644
--- a/tools/test/h5repack/CMakeVFDTests.cmake
+++ b/tools/test/h5repack/CMakeVFDTests.cmake
@@ -16,8 +16,6 @@
 ##############################################################################
 ##############################################################################
 
-H5_SET_VFD_LIST()
-
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###