diff --git a/test/CMakePassthroughVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake
index fbff51aebf0..55f112b90d2 100644
--- a/test/CMakePassthroughVOLTests.cmake
+++ b/test/CMakePassthroughVOLTests.cmake
@@ -182,6 +182,15 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD
 
   macro (ADD_VOL_TEST volname volinfo resultcode)
     #message(STATUS "volname=${volname} volinfo=${volinfo}")
+    foreach (h5_test ${H5_EXPRESS_TESTS})
+      if (NOT h5_test IN_LIST H5_VOL_SKIP_TESTS)
+        if (WIN32)
+          CHECK_VOL_TEST (${h5_test} ${volname} "${volinfo}" ${resultcode})
+        else ()
+          DO_VOL_TEST (${h5_test} ${volname} "${volinfo}" ${resultcode})
+        endif ()
+      endif ()
+    endforeach ()
     foreach (h5_test ${H5_TESTS})
       if (NOT h5_test IN_LIST H5_VOL_SKIP_TESTS)
         if (WIN32)
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index a3b40a6107a..6086cbc9537 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -203,6 +203,15 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD
   endmacro ()
 
   macro (ADD_VFD_TEST vfdname resultcode)
+    foreach (h5_test ${H5_EXPRESS_TESTS})
+      if (NOT h5_test IN_LIST H5_VFD_SKIP_TESTS)
+        if (WIN32)
+          CHECK_VFD_TEST (${h5_test} ${vfdname} ${resultcode})
+        else ()
+          DO_VFD_TEST (${h5_test} ${vfdname} ${resultcode})
+        endif ()
+      endif ()
+    endforeach ()
     foreach (h5_test ${H5_TESTS})
       if (NOT h5_test IN_LIST H5_VFD_SKIP_TESTS)
         if (WIN32)