diff --git a/test/h5b_read.c b/test/h5b_read.c
index 820da2c..090927b 100644
--- a/test/h5b_read.c
+++ b/test/h5b_read.c
@@ -241,8 +241,8 @@ void h5b_test_read1(void)
 
 	TEST("Opening file once, read-only");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
diff --git a/test/h5b_write.c b/test/h5b_write.c
index 8f66b38..294a503 100644
--- a/test/h5b_write.c
+++ b/test/h5b_write.c
@@ -183,8 +183,8 @@ void h5b_test_write1(void)
 
 	TEST("Opening file once, write-truncate");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
diff --git a/test/h5u_read.c b/test/h5u_read.c
index 85c0b7a..8a37b38 100644
--- a/test/h5u_read.c
+++ b/test/h5u_read.c
@@ -503,8 +503,8 @@ void h5u_test_read4(void)
 
 	TEST("Opening file twice, read-only, MPI-IO Independent VFD");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
diff --git a/test/h5u_write.c b/test/h5u_write.c
index ef73097..22cccbb 100644
--- a/test/h5u_write.c
+++ b/test/h5u_write.c
@@ -358,8 +358,8 @@ void h5u_test_write1(void)
 
 	TEST("Opening file once, write-truncate");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
@@ -386,8 +386,8 @@ void h5u_test_write2(void)
 
 	TEST("Opening file twice, write-append + read-only");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
@@ -420,8 +420,8 @@ void h5u_test_write3(void)
 
 	TEST("Opening file once, write-truncate, MPI-POSIX VFD");
         h5_prop_t props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
 
@@ -455,8 +455,8 @@ void h5u_test_write4(void)
 
 	TEST("Opening file twice, write-append + read-only, MPI-IO Independent VFD");
         props = H5CreateFileProp ();
-        status = H5SetPropFileMPIO (props, &comm);
-	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
+        status = H5SetPropFileMPIOCollective (props, &comm);
+	RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
         status = H5SetPropFileThrottle (props, 2);
 	RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");