diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index fc94a68d32f..224b09974d0 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -35,6 +35,9 @@ endif ()
 set_tests_properties (CPP_testhdf5 PROPERTIES
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
+if ("CPP_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (CPP_testhdf5 PROPERTIES DISABLED true)
+endif ()
 
 ##############################################################################
 ##############################################################################
diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake
index 5405df3a252..52f8069f390 100644
--- a/c++/test/CMakeVFDTests.cmake
+++ b/c++/test/CMakeVFDTests.cmake
@@ -37,6 +37,9 @@ macro (ADD_VFD_TEST vfdname resultcode)
             -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
     )
     set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
+    if ("CPP_VFD-${vfdname}-cpp_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DISABLED true)
+    endif ()
   endif ()
 endmacro ()
 
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index 02c23bb7e73..46b89728bea 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -94,6 +94,9 @@ endif ()
 set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES
     FIXTURES_REQUIRED clear_testhdf5_fortran
 )
+if ("FORTRAN_testhdf5_fortran" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES DISABLED true)
+endif ()
 
 #-- Adding test for testhdf5_fortran_1_8
 if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -118,6 +121,9 @@ set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES
     DEPENDS FORTRAN_testhdf5_fortran
     FIXTURES_REQUIRED clear_testhdf5_fortran
 )
+if ("FORTRAN_testhdf5_fortran_1_8" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DISABLED true)
+endif ()
 
 #-- Adding test for fortranlib_test_F03
 if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -142,6 +148,9 @@ set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES
     DEPENDS FORTRAN_testhdf5_fortran_1_8
     FIXTURES_REQUIRED clear_testhdf5_fortran
 )
+if ("FORTRAN_fortranlib_test_F03" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DISABLED true)
+endif ()
 
 #-- Adding test for vol_connector
 if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -164,6 +173,9 @@ endif ()
 set_tests_properties (FORTRAN_vol_connector PROPERTIES
     FIXTURES_REQUIRED clear_testhdf5_fortran
 )
+if ("FORTRAN_vol_connector" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_vol_connector PROPERTIES DISABLED true)
+endif ()
 
 #-- Adding test for fflush1
 add_test (
@@ -177,6 +189,9 @@ add_test (
 set_tests_properties (FORTRAN_fflush1 PROPERTIES
     DEPENDS FORTRAN_flush1-clear-objects
 )
+if ("FORTRAN_fflush1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_fflush1 PROPERTIES DISABLED true)
+endif ()
 
 #-- Adding test for fflush2
 add_test (
@@ -186,6 +201,9 @@ add_test (
 set_tests_properties (FORTRAN_fflush2 PROPERTIES
     DEPENDS FORTRAN_fflush1
 )
+if ("FORTRAN_fflush2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (FORTRAN_fflush2 PROPERTIES DISABLED true)
+endif ()
 add_test (
     NAME FORTRAN_flush1-clean-objects
     COMMAND ${CMAKE_COMMAND} -E remove flush.h5
diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake
index 473049fb976..f9ce2b829c7 100644
--- a/fortran/testpar/CMakeTests.cmake
+++ b/fortran/testpar/CMakeTests.cmake
@@ -16,5 +16,16 @@
 ##############################################################################
 ##############################################################################
 add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS})
+if ("MPI_TEST_FORT_parallel_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (MPI_TEST_FORT_parallel_test PROPERTIES DISABLED true)
+endif ()
+
 add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS})
+if ("MPI_TEST_FORT_subfiling_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (MPI_TEST_FORT_subfiling_test PROPERTIES DISABLED true)
+endif ()
+
 add_test (NAME MPI_TEST_FORT_async_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:async_test> ${MPIEXEC_POSTFLAGS})
+if ("MPI_TEST_FORT_async_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (MPI_TEST_FORT_async_test PROPERTIES DISABLED true)
+endif ()
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 4137270b9fe..b07dd6d0a24 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -44,6 +44,9 @@ else ()
   )
 endif ()
 set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
+if ("HL_CPP_ptableTest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (HL_CPP_ptableTest PROPERTIES DISABLED true)
+endif ()
 add_test (
     NAME HL_CPP_ptableTest-clean-objects
     COMMAND    ${CMAKE_COMMAND}
@@ -53,3 +56,4 @@ set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES
     DEPENDS HL_CPP_ptableTest
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
+
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 209186b58f3..84218728db6 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -68,6 +68,9 @@ macro (ADD_H5_FORTRAN_TEST file)
       FIXTURES_REQUIRED clear_HL_FORTRAN_test
       WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
+  if ("HL_FORTRAN_f90_${file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+    set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DISABLED true)
+  endif ()
 endmacro ()
 
 foreach (h5_test ${H5_TESTS})
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index 781ed143219..6ec5f29a534 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -118,6 +118,9 @@ macro (HL_ADD_TEST hl_name)
       ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}"
       WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
   )
+  if ("HL_${hl_name}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+    set_tests_properties (HL_${hl_name} PROPERTIES DISABLED true)
+  endif ()
 endmacro ()
 
 HL_add_test (test_lite )
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 967795bdd83..43137a22d5c 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -175,6 +175,9 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         FIXTURES_REQUIRED clear_JUnit
         WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test
     )
+    if ("JUnit-${test_file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+      set_tests_properties (JUnit-${test_file} PROPERTIES DISABLED true)
+    endif ()
   endforeach ()
 
 
@@ -208,6 +211,9 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
         WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname}
     )
+    if ("JUnit-VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+      set_tests_properties (JUnit-VOL-${volname}-${voltest} PROPERTIES DISABLED true)
+    endif ()
     add_test (
         NAME JUnit-VOL-${volname}-${voltest}-clean-objects
         COMMAND ${CMAKE_COMMAND} -E remove
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index 16d9c260a0e..36a97eefc81 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -55,9 +55,9 @@ set_tests_properties (MPI_TEST_testphdf5 PROPERTIES
     ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
     WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
 )
-  if ("MPI_TEST_testphdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
-    set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DISABLED true)
-  endif ()
+if ("MPI_TEST_testphdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DISABLED true)
+endif ()
 if (last_test)
   set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DEPENDS ${last_test})
 endif ()