diff --git a/tests/cunit/test_async_3proc.c b/tests/cunit/test_async_3proc.c
index bc7090e3e40..8eff69fdf24 100644
--- a/tests/cunit/test_async_3proc.c
+++ b/tests/cunit/test_async_3proc.c
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
                 /* Finalize the IO system. Only call this from the computation tasks. */
                 for (int c = 0; c < COMPONENT_COUNT; c++)
                 {
-                    if ((ret = PIOc_finalize(iosysid[c])))
+                    if ((ret = PIOc_free_iosystem(iosysid[c])))
                         ERR(ret);
                 }
             } /* endif comp_task */
diff --git a/tests/cunit/test_async_4proc.c b/tests/cunit/test_async_4proc.c
index 5b32d284581..833110388f3 100644
--- a/tests/cunit/test_async_4proc.c
+++ b/tests/cunit/test_async_4proc.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 
                 /* Finalize the IO system. Only call this from the computation tasks. */
                 for (int c = 0; c < COMPONENT_COUNT; c++)
-                    if ((ret = PIOc_finalize(iosysid[c])))
+                    if ((ret = PIOc_free_iosystem(iosysid[c])))
                         ERR(ret);
             } /* endif comp_task */
 
diff --git a/tests/cunit/test_async_manyproc.c b/tests/cunit/test_async_manyproc.c
index 0a0b57f94e6..7c943ad0619 100644
--- a/tests/cunit/test_async_manyproc.c
+++ b/tests/cunit/test_async_manyproc.c
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
 
             /* Finalize the IO system. Only call this from the computation tasks. */
             for (int c = 0; c < COMPONENT_COUNT; c++)
-                if ((ret = PIOc_finalize(iosysid[c])))
+                if ((ret = PIOc_free_iosystem(iosysid[c])))
                     ERR(ret);
         } /* endif comp_task */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_async_mpi.c b/tests/cunit/test_async_mpi.c
index de8222417e6..e4e615a6c58 100644
--- a/tests/cunit/test_async_mpi.c
+++ b/tests/cunit/test_async_mpi.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * This program tests some MPI functionality that is used in PIO. This
  * runs on three processors, and does the same MPI commands that are
  * done when async mode is used, with 1 IO task, and two computation
diff --git a/tests/cunit/test_async_multi2.c b/tests/cunit/test_async_multi2.c
index cf2cd276d24..94512f536a5 100644
--- a/tests/cunit/test_async_multi2.c
+++ b/tests/cunit/test_async_multi2.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 
             /* Finalize the IO system. Only call this from the computation tasks. */
             for (int c = 0; c < COMPONENT_COUNT; c++)
-                if ((ret = PIOc_finalize(iosysid[c])))
+                if ((ret = PIOc_free_iosystem(iosysid[c])))
                     ERR(ret);
         } /* endif comp_task */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_async_multicomp.c b/tests/cunit/test_async_multicomp.c
index ed865cd74da..9f1819b9fe3 100644
--- a/tests/cunit/test_async_multicomp.c
+++ b/tests/cunit/test_async_multicomp.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 
             /* Finalize the IO system. Only call this from the computation tasks. */
             for (int c = 0; c < COMPONENT_COUNT; c++)
-                if ((ret = PIOc_finalize(iosysid[c])))
+                if ((ret = PIOc_free_iosystem(iosysid[c])))
                     ERR(ret);
         } /* endif comp_task */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_async_perf.c b/tests/cunit/test_async_perf.c
index e5f5759b4e3..89adde1a1bd 100644
--- a/tests/cunit/test_async_perf.c
+++ b/tests/cunit/test_async_perf.c
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
                     return ret;
 
                 /* Finalize PIO system. */
-                if ((ret = PIOc_finalize(iosysid)))
+                if ((ret = PIOc_free_iosystem(iosysid)))
                     return ret;
 
                 /* Free the computation conomponent communicator. */
diff --git a/tests/cunit/test_async_simple.c b/tests/cunit/test_async_simple.c
index c5d4839cb9c..d8520efbd32 100644
--- a/tests/cunit/test_async_simple.c
+++ b/tests/cunit/test_async_simple.c
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
 
             /* Finalize the IO system. Only call this from the computation tasks. */
             for (int c = 0; c < COMPONENT_COUNT; c++)
-                if ((ret = PIOc_finalize(iosysid[c])))
+                if ((ret = PIOc_free_iosystem(iosysid[c])))
                     ERR(ret);
         } /* endif comp_task */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_common.c b/tests/cunit/test_common.c
index 0b89fe2d3d4..2846a6bc1c7 100644
--- a/tests/cunit/test_common.c
+++ b/tests/cunit/test_common.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Common test code for PIO C tests.
  *
  * Ed Hartnett
diff --git a/tests/cunit/test_darray.c b/tests/cunit/test_darray.c
index 37766fab1fc..70d7b9d2b82 100644
--- a/tests/cunit/test_darray.c
+++ b/tests/cunit/test_darray.c
@@ -411,7 +411,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         } /* next rearranger */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_darray_1d.c b/tests/cunit/test_darray_1d.c
index 1344ec53072..556c2ae1eb3 100644
--- a/tests/cunit/test_darray_1d.c
+++ b/tests/cunit/test_darray_1d.c
@@ -865,7 +865,7 @@ int main(int argc, char **argv)
             }
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         } /* next rearranger */
 
diff --git a/tests/cunit/test_darray_2sync.c b/tests/cunit/test_darray_2sync.c
index e0a81c84be6..406bd7685d1 100644
--- a/tests/cunit/test_darray_2sync.c
+++ b/tests/cunit/test_darray_2sync.c
@@ -512,7 +512,7 @@ int run_async_tests(MPI_Comm test_comm, int my_rank, int num_iotypes, int *iotyp
             ERR(ret);
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             return ret;
 
         /* Free the computation conomponent communicator. */
@@ -548,7 +548,7 @@ int run_noasync_tests(MPI_Comm test_comm, int my_rank, int num_iotypes, int *iot
         ERR(ret);
 
     /* Finalize PIO system. */
-    if ((ret = PIOc_finalize(iosysid)))
+    if ((ret = PIOc_free_iosystem(iosysid)))
         return ret;
 
     return PIO_NOERR;
diff --git a/tests/cunit/test_darray_3d.c b/tests/cunit/test_darray_3d.c
index 46addc658d7..dc77f40ee3a 100644
--- a/tests/cunit/test_darray_3d.c
+++ b/tests/cunit/test_darray_3d.c
@@ -401,7 +401,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
 
         } /* next rearranger */
diff --git a/tests/cunit/test_darray_async.c b/tests/cunit/test_darray_async.c
index d8dd7a62334..d08da44442a 100644
--- a/tests/cunit/test_darray_async.c
+++ b/tests/cunit/test_darray_async.c
@@ -542,7 +542,7 @@ int main(int argc, char **argv)
                     return ret;
 
                 /* Finalize PIO system. */
-                if ((ret = PIOc_free_iosystem(iosysid)))
+                if ((ret = PIOc_free_iosystem (iosysid)))
                     return ret;
 
                 /* Free the computation conomponent communicator. */
diff --git a/tests/cunit/test_darray_async_many.c b/tests/cunit/test_darray_async_many.c
index 9638c64854e..9af212ce81d 100644
--- a/tests/cunit/test_darray_async_many.c
+++ b/tests/cunit/test_darray_async_many.c
@@ -642,7 +642,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
 
             /* Free the computation conomponent communicator. */
diff --git a/tests/cunit/test_darray_async_simple.c b/tests/cunit/test_darray_async_simple.c
index c5a8f0f5d16..1947961472c 100644
--- a/tests/cunit/test_darray_async_simple.c
+++ b/tests/cunit/test_darray_async_simple.c
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
 
             /* Free the computation conomponent communicator. */
diff --git a/tests/cunit/test_darray_fill.c b/tests/cunit/test_darray_fill.c
index 7065e37b021..0dafa22899b 100644
--- a/tests/cunit/test_darray_fill.c
+++ b/tests/cunit/test_darray_fill.c
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
             } /* next fill value test case */
 
             /* Finalize PIO iosysid. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         } /* next rearranger */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_darray_frame.c b/tests/cunit/test_darray_frame.c
index ad811afe8b2..949e90ebfb4 100644
--- a/tests/cunit/test_darray_frame.c
+++ b/tests/cunit/test_darray_frame.c
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         } /* next rearranger */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_darray_multi.c b/tests/cunit/test_darray_multi.c
index a32e1e8f101..2784ee0c53a 100644
--- a/tests/cunit/test_darray_multi.c
+++ b/tests/cunit/test_darray_multi.c
@@ -464,7 +464,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         } /* next rearranger */
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_darray_multivar.c b/tests/cunit/test_darray_multivar.c
index 0c5ecc616e8..5a38cb292f1 100644
--- a/tests/cunit/test_darray_multivar.c
+++ b/tests/cunit/test_darray_multivar.c
@@ -587,7 +587,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
         }
 
diff --git a/tests/cunit/test_darray_multivar2.c b/tests/cunit/test_darray_multivar2.c
index 0637ed9c66d..377f77a1b29 100644
--- a/tests/cunit/test_darray_multivar2.c
+++ b/tests/cunit/test_darray_multivar2.c
@@ -275,7 +275,7 @@ int main(int argc, char **argv)
             return ret;
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             return ret;
 
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_darray_multivar3.c b/tests/cunit/test_darray_multivar3.c
index eeba70aa689..8f252808522 100644
--- a/tests/cunit/test_darray_multivar3.c
+++ b/tests/cunit/test_darray_multivar3.c
@@ -323,7 +323,7 @@ int main(int argc, char **argv)
             ERR(ret);
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             return ret;
 
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_decomp_frame.c b/tests/cunit/test_decomp_frame.c
index 0f359d791f6..54969a8b4c1 100644
--- a/tests/cunit/test_decomp_frame.c
+++ b/tests/cunit/test_decomp_frame.c
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
         } /* next rearranger */
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             return ret;
 
     } /* endif my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_decomp_uneven.c b/tests/cunit/test_decomp_uneven.c
index 74cb0b4ddc9..8008c06d2d7 100644
--- a/tests/cunit/test_decomp_uneven.c
+++ b/tests/cunit/test_decomp_uneven.c
@@ -354,7 +354,7 @@ int main(int argc, char **argv)
             }
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
 
         } /* next rearranger */
diff --git a/tests/cunit/test_decomps.c b/tests/cunit/test_decomps.c
index f739544b53d..0c57eec9104 100644
--- a/tests/cunit/test_decomps.c
+++ b/tests/cunit/test_decomps.c
@@ -420,7 +420,7 @@ int main(int argc, char **argv)
                     ERR(ret);
 
                 /* Finalize PIO systems. */
-                if ((ret = PIOc_finalize(iosysid)))
+                if ((ret = PIOc_free_iosystem(iosysid)))
                     ERR(ret);
             } /* next io test */
         } /* next rearranger */
diff --git a/tests/cunit/test_intercomm2.c b/tests/cunit/test_intercomm2.c
index e28d2316d89..eb99e0ff868 100644
--- a/tests/cunit/test_intercomm2.c
+++ b/tests/cunit/test_intercomm2.c
@@ -521,7 +521,7 @@ int main(int argc, char **argv)
             } /* next netcdf flavor */
 
             /* Finalize the IO system. Only call this from the computation tasks. */
-            if ((ret = PIOc_finalize(iosysid[my_comp_idx])))
+            if ((ret = PIOc_free_iosystem(iosysid[my_comp_idx])))
                 ERR(ret);
         }
     } /* my_rank < TARGET_NTASKS */
diff --git a/tests/cunit/test_iosystem2.c b/tests/cunit/test_iosystem2.c
index 2a0abe5d019..285fa9d156d 100644
--- a/tests/cunit/test_iosystem2.c
+++ b/tests/cunit/test_iosystem2.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
             ERR(ret);
 
         /* This should fail. */
-        if (PIOc_finalize(iosysid + TEST_VAL_42) != PIO_EBADID)
+        if (PIOc_free_iosystem(iosysid + TEST_VAL_42) != PIO_EBADID)
             ERR(ERR_WRONG);
 
         /* Initialize another PIO system. */
@@ -201,11 +201,11 @@ int main(int argc, char **argv)
             MPIERR(ret);
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             ERR(ret);
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid_world)))
+        if ((ret = PIOc_free_iosystem(iosysid_world)))
             ERR(ret);
     } /* my_rank < TARGET_NTASKS */
 
diff --git a/tests/cunit/test_iosystem2_simple.c b/tests/cunit/test_iosystem2_simple.c
index 065e181e324..863d94faf6e 100644
--- a/tests/cunit/test_iosystem2_simple.c
+++ b/tests/cunit/test_iosystem2_simple.c
@@ -221,12 +221,12 @@ int main(int argc, char **argv)
             MPIERR(ret);
 
         /* Finalize PIO odd/even intracomm. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             ERR(ret);
 
 
         /* Finalize PIO world intracomm. */
-        if ((ret = PIOc_finalize(iosysid_world)))
+        if ((ret = PIOc_free_iosystem(iosysid_world)))
             ERR(ret);
     }/* my_rank < TARGET_NTASKS */
 
diff --git a/tests/cunit/test_iosystem2_simple2.c b/tests/cunit/test_iosystem2_simple2.c
index 00ebc7cdd6c..d4db1540f70 100644
--- a/tests/cunit/test_iosystem2_simple2.c
+++ b/tests/cunit/test_iosystem2_simple2.c
@@ -120,11 +120,11 @@ int main(int argc, char **argv)
             MPIERR(ret);
 
         /* Finalize PIO odd/even intracomm. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             ERR(ret);
 
         /* Finalize PIO world intracomm. */
-        if ((ret = PIOc_finalize(iosysid_world)))
+        if ((ret = PIOc_free_iosystem(iosysid_world)))
             ERR(ret);
     }  /* my_rank < TARGET_NTASKS */
 
diff --git a/tests/cunit/test_iosystem3.c b/tests/cunit/test_iosystem3.c
index ecd59b03655..6470a91c16f 100644
--- a/tests/cunit/test_iosystem3.c
+++ b/tests/cunit/test_iosystem3.c
@@ -317,14 +317,14 @@ int main(int argc, char **argv)
         
             /* Finalize PIO systems. */
             if (even_comm != MPI_COMM_NULL)
-                if ((ret = PIOc_finalize(even_iosysid)))
+                if ((ret = PIOc_free_iosystem(even_iosysid)))
                     ERR(ret);
             if (overlap_comm != MPI_COMM_NULL)
             {
-                if ((ret = PIOc_finalize(overlap_iosysid)))
+                if ((ret = PIOc_free_iosystem(overlap_iosysid)))
                     ERR(ret);
             }
-            if ((ret = PIOc_finalize(iosysid_world)))
+            if ((ret = PIOc_free_iosystem(iosysid_world)))
                 ERR(ret);
 
             /* Free MPI resources used by test. */
diff --git a/tests/cunit/test_iosystem3_simple.c b/tests/cunit/test_iosystem3_simple.c
index b78f8b420c1..a144c206e7a 100644
--- a/tests/cunit/test_iosystem3_simple.c
+++ b/tests/cunit/test_iosystem3_simple.c
@@ -85,10 +85,10 @@ int main(int argc, char **argv)
 
         /* Finalize PIO system. */
         if (overlap_comm != MPI_COMM_NULL)
-            if ((ret = PIOc_finalize(overlap_iosysid)))
+            if ((ret = PIOc_free_iosystem(overlap_iosysid)))
                 ERR(ret);
 
-        if ((ret = PIOc_finalize(iosysid_world)))
+        if ((ret = PIOc_free_iosystem(iosysid_world)))
             ERR(ret);
 
         /* Free MPI resources used by test. */
diff --git a/tests/cunit/test_iosystem3_simple2.c b/tests/cunit/test_iosystem3_simple2.c
index 7f43f64aad7..627c2882549 100644
--- a/tests/cunit/test_iosystem3_simple2.c
+++ b/tests/cunit/test_iosystem3_simple2.c
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
         } /* next iotype */
 
         /* Finalize PIO systems. */
-        if ((ret = PIOc_finalize(iosysid_world)))
+        if ((ret = PIOc_free_iosystem(iosysid_world)))
             ERR(ret);
     } /* my_rank < TARGET_NTASKS */
 
diff --git a/tests/cunit/test_perf2.c b/tests/cunit/test_perf2.c
index 2079b3c81dc..858623bce9b 100644
--- a/tests/cunit/test_perf2.c
+++ b/tests/cunit/test_perf2.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
                 return ret;
 
             /* Finalize PIO system. */
-            if ((ret = PIOc_finalize(iosysid)))
+            if ((ret = PIOc_free_iosystem(iosysid)))
                 return ret;
 
         } /* next rearranger */
diff --git a/tests/cunit/test_pioc.c b/tests/cunit/test_pioc.c
index 2c4819de3f4..9bdb0560351 100644
--- a/tests/cunit/test_pioc.c
+++ b/tests/cunit/test_pioc.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Tests for PIO Functions.
  *
  * @author Ed Hartnett
diff --git a/tests/cunit/test_pioc_fill.c b/tests/cunit/test_pioc_fill.c
index 52e0571a6eb..82963142095 100644
--- a/tests/cunit/test_pioc_fill.c
+++ b/tests/cunit/test_pioc_fill.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * More tests for PIO data reading and writing routines.
  *
  * Ed Hartnett
diff --git a/tests/cunit/test_pioc_putget.c b/tests/cunit/test_pioc_putget.c
index 5b01fd424e1..78e55f2e9d6 100644
--- a/tests/cunit/test_pioc_putget.c
+++ b/tests/cunit/test_pioc_putget.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Tests for PIO data reading and writing routines.
  *
  * @author Ed Hartnett
diff --git a/tests/cunit/test_pioc_unlim.c b/tests/cunit/test_pioc_unlim.c
index 115b30bca7f..88621523e37 100644
--- a/tests/cunit/test_pioc_unlim.c
+++ b/tests/cunit/test_pioc_unlim.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Tests for PIO Functions. In this test we use a simple 3D variable,
  * with an unlimited dimension. The data will have two timesteps, and
  * 4x4 elements each timestep.
diff --git a/tests/cunit/test_rearr.c b/tests/cunit/test_rearr.c
index 06e18474d6f..3f29022713a 100644
--- a/tests/cunit/test_rearr.c
+++ b/tests/cunit/test_rearr.c
@@ -1578,7 +1578,7 @@ int main(int argc, char **argv)
                     return ret;
 
                 /* Finalize PIO system. */
-                if ((ret = PIOc_finalize(iosysid)))
+                if ((ret = PIOc_free_iosystem(iosysid)))
                     return ret;
             } /* next numio */
         } /* next rearranger */
diff --git a/tests/cunit/test_shared.c b/tests/cunit/test_shared.c
index 9d999700994..cd73089177d 100644
--- a/tests/cunit/test_shared.c
+++ b/tests/cunit/test_shared.c
@@ -48,7 +48,7 @@ int test_async2(int my_rank, int num_flavors, int *flavor, MPI_Comm test_comm,
                 return ret;
 
             /* Finalize the IO system. Only call this from the computation tasks. */
-            if ((ret = PIOc_finalize(iosysid[c])))
+            if ((ret = PIOc_free_iosystem(iosysid[c])))
                 ERR(ret);
             if ((mpierr = MPI_Comm_free(&comp_comm[c])))
                 MPIERR(mpierr);
@@ -118,7 +118,7 @@ int test_no_async2(int my_rank, int num_flavors, int *flavor, MPI_Comm test_comm
         return ret;
 
     /* Finalize PIO system. */
-    if ((ret = PIOc_finalize(iosysid)))
+    if ((ret = PIOc_free_iosystem(iosysid)))
         return ret;
 
     return PIO_NOERR;
diff --git a/tests/cunit/test_spmd.c b/tests/cunit/test_spmd.c
index 176f010ec58..5db8c3a3b81 100644
--- a/tests/cunit/test_spmd.c
+++ b/tests/cunit/test_spmd.c
@@ -780,7 +780,7 @@ int main(int argc, char **argv)
             return ret;
 
         /* Finalize PIO system. */
-        if ((ret = PIOc_finalize(iosysid)))
+        if ((ret = PIOc_free_iosystem(iosysid)))
             return ret;
 
     } /* endif my_rank < TARGET_NTASKS */