diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 4e6036188d..b01e4d4304 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -383,6 +383,7 @@ if (NOT ONLY_SHARED_LIBS)
       ${MOD_BUILD_DIR}/h5r.mod
       ${MOD_BUILD_DIR}/h5s.mod
       ${MOD_BUILD_DIR}/h5t.mod
+      ${MOD_BUILD_DIR}/h5vl.mod
       ${MOD_BUILD_DIR}/h5z.mod
       ${MOD_BUILD_DIR}/h5_gen.mod
   )
@@ -415,6 +416,7 @@ if (BUILD_SHARED_LIBS)
       ${MODSH_BUILD_DIR}/h5r.mod
       ${MODSH_BUILD_DIR}/h5s.mod
       ${MODSH_BUILD_DIR}/h5t.mod
+      ${MODSH_BUILD_DIR}/h5vl.mod
       ${MODSH_BUILD_DIR}/h5z.mod
       ${MODSH_BUILD_DIR}/h5_gen.mod
   )
diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake
index 3ac5fc1952..db1f805cdf 100644
--- a/tools/test/misc/CMakeTestsMkgrp.cmake
+++ b/tools/test/misc/CMakeTestsMkgrp.cmake
@@ -82,7 +82,7 @@
       if (last_test)
         set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
-    else (HDF5_ENABLE_USING_MEMCHECKER)
+    else ()
       set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}-clear-objects)
       add_test (
           NAME H5MKGRP-${resultfile}-h5ls