diff --git a/test/class/opal_hash_table.c b/test/class/opal_hash_table.c
index a3ec0e734c..e1a071a843 100644
--- a/test/class/opal_hash_table.c
+++ b/test/class/opal_hash_table.c
@@ -295,7 +295,7 @@ int main(int argc, char **argv)
     fclose( error_out );
 #endif
 
-    opal_finalize();
+    opal_finalize_util ();
     
     return test_finalize();
 }
diff --git a/test/class/opal_list.c b/test/class/opal_list.c
index 51e3f13ba7..733a0cc959 100644
--- a/test/class/opal_list.c
+++ b/test/class/opal_list.c
@@ -343,7 +343,7 @@ int main(int argc, char **argv)
 
     if (NULL != elements) free(elements);
 
-    opal_finalize();
+    opal_finalize_util ();
 
     return test_finalize();
 }
diff --git a/test/class/opal_proc_table.c b/test/class/opal_proc_table.c
index ca573eb948..9b57e8c632 100644
--- a/test/class/opal_proc_table.c
+++ b/test/class/opal_proc_table.c
@@ -301,7 +301,7 @@ int main(int argc, char **argv)
     fclose( error_out );
 #endif
 
-    opal_finalize();
+    opal_finalize_util ();
     
     return test_finalize();
 }
diff --git a/test/class/opal_tree.c b/test/class/opal_tree.c
index cfbeaa2294..5eb2cac94f 100644
--- a/test/class/opal_tree.c
+++ b/test/class/opal_tree.c
@@ -254,7 +254,7 @@ int main(int argc, char **argv)
 
     if (NULL != elements) free(elements);
     
-    opal_finalize();
+    opal_finalize_util ();
 
     return test_finalize();
 }
diff --git a/test/class/opal_value_array.c b/test/class/opal_value_array.c
index 7187a495b4..e16272eb9b 100644
--- a/test/class/opal_value_array.c
+++ b/test/class/opal_value_array.c
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
     
     OBJ_DESTRUCT(&array);
 
-    opal_finalize();
+    opal_finalize_util ();
 
     return test_finalize();
 }