6 files changed, 6 insertions, 4 deletions
diff --git a/test/family_v1.6_00000.h5 b/test/family_v16_00000.h5
index 5b69c93..5b69c93 100644
--- a/test/family_v1.6_00000.h5
+++ b/test/family_v16_00000.h5
diff --git a/test/family_v1.6_00001.h5 b/test/family_v16_00001.h5
index bf55b32..bf55b32 100644
--- a/test/family_v1.6_00001.h5
+++ b/test/family_v16_00001.h5
diff --git a/test/family_v1.6_00002.h5 b/test/family_v16_00002.h5
index 9bd0891..9bd0891 100644
--- a/test/family_v1.6_00002.h5
+++ b/test/family_v16_00002.h5
diff --git a/test/family_v1.6_00003.h5 b/test/family_v16_00003.h5
index fedce2a..fedce2a 100644
--- a/test/family_v1.6_00003.h5
+++ b/test/family_v16_00003.h5
diff --git a/test/flush2.c b/test/flush2.c
index dbb0a82..5ec5300 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -196,7 +196,8 @@ main(void)
 #if defined _WIN32 && defined _HDF5USEDLL_
 	SKIPPED();
 	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-
+#elif defined H5_VMS
+        SKIPPED();
 #else
         H5_FAILED()
         goto error;
@@ -218,7 +219,8 @@ main(void)
 #if defined _WIN32 && defined _HDF5USEDLL_
 	SKIPPED();
 	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-
+#elif defined H5_VMS
+        SKIPPED();
 #else
         H5_FAILED()
         goto error;
diff --git a/test/vfd.c b/test/vfd.c
index 5598ddd..b5ca096 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -49,7 +49,7 @@ const char *FILENAME[] = {
     NULL
 };
 
-#define COMPAT_BASENAME "family_v1.6_"
+#define COMPAT_BASENAME "family_v16_"
 
 
 /*-------------------------------------------------------------------------
@@ -787,7 +787,7 @@ error:
  *              The source file was created by the test/file_handle.c
  *              of the v1.6 library.  Then tools/misc/h5repart.c was
  *              used to concantenated.  The command was "h5repart -m 5k
- *              family_file%05d.h5 family_v1.6_%05d.h5".
+ *              family_file%05d.h5 family_v16_%05d.h5".
  *
  * Return:      Success:        0
  *              Failure:        -1