diff --git a/test/h5b_write.c b/test/h5b_write.c
index 56219cc..cfccf27 100644
--- a/test/h5b_write.c
+++ b/test/h5b_write.c
@@ -209,7 +209,7 @@ void h5b_test_write2(void)
 	h5_err_t status;
 
 	TEST("Opening file twice, write-append + read-only");
-	file1 = H5OpenFile(FILENAME, H5_O_APPEND, H5_PROP_DEFAULT);
+	file1 = H5OpenFile(FILENAME, H5_O_APPENDONLY, H5_PROP_DEFAULT);
 
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
diff --git a/test/h5u_read.c b/test/h5u_read.c
index fb0cb4b..85c0b7a 100644
--- a/test/h5u_read.c
+++ b/test/h5u_read.c
@@ -478,7 +478,7 @@ void h5u_test_read3(void)
 	h5_int64_t status;
 
 	TEST("Opening file once, read-only, MPI-POSIX VFD");
-	file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIPOSIX, H5_PROP_DEFAULT);
+	file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIO_POSIX, H5_PROP_DEFAULT);
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
 
@@ -508,11 +508,11 @@ void h5u_test_read4(void)
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
-	file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
+	file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIO_INDEPENDENT, props);
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
 
-	file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
+	file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIO_INDEPENDENT, props);
 	status = H5CheckFile(file2);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
 
diff --git a/test/h5u_write.c b/test/h5u_write.c
index 2448d03..0a3106e 100644
--- a/test/h5u_write.c
+++ b/test/h5u_write.c
@@ -392,7 +392,7 @@ void h5u_test_write2(void)
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
-	file1 = H5OpenFile(FILENAME, H5_O_APPEND, props);
+	file1 = H5OpenFile(FILENAME, H5_O_APPENDONLY, props);
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
 
@@ -426,7 +426,7 @@ void h5u_test_write3(void)
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
-	file1 = H5OpenFile(FILENAME, H5_O_WRONLY | H5_VFD_MPIPOSIX, props);
+	file1 = H5OpenFile(FILENAME, H5_O_WRONLY | H5_VFD_MPIO_POSIX, props);
 
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
@@ -461,11 +461,11 @@ void h5u_test_write4(void)
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
-	file1 = H5OpenFile(FILENAME, H5_O_APPEND | H5_VFD_MPIIO_IND, props);
+	file1 = H5OpenFile(FILENAME, H5_O_APPENDONLY | H5_VFD_MPIO_INDEPENDENT, props);
 	status = H5CheckFile(file1);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");
 
-	file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
+	file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIO_INDEPENDENT, props);
 	status = H5CheckFile(file2);
 	RETURN(status, H5_SUCCESS, "H5CheckFile");