diff --git a/test/class/opal_fifo.c b/test/class/opal_fifo.c
index 6fe1302a71..a7adf08171 100644
--- a/test/class/opal_fifo.c
+++ b/test/class/opal_fifo.c
@@ -109,7 +109,7 @@ int main (int argc, char *argv[]) {
     double timing;
     int rc;
 
-    rc = opal_init (&argc, &argv);
+    rc = opal_init_util (&argc, &argv);
     test_verify_int(OPAL_SUCCESS, rc);
     if (OPAL_SUCCESS != rc) {
         test_finalize();
@@ -246,7 +246,7 @@ int main (int argc, char *argv[]) {
 
     OBJ_DESTRUCT(&fifo);
 
-    opal_finalize ();
+    opal_finalize_util ();
 
     return test_finalize ();
 }
diff --git a/test/class/opal_lifo.c b/test/class/opal_lifo.c
index 1845068fc3..aee1494ae3 100644
--- a/test/class/opal_lifo.c
+++ b/test/class/opal_lifo.c
@@ -72,7 +72,7 @@ int main (int argc, char *argv[]) {
     double timing;
     int rc;
 
-    rc = opal_init (&argc, &argv);
+    rc = opal_init_util (&argc, &argv);
     test_verify_int(OPAL_SUCCESS, rc);
     if (OPAL_SUCCESS != rc) {
         test_finalize();
@@ -183,7 +183,7 @@ int main (int argc, char *argv[]) {
 
     OBJ_DESTRUCT(&lifo);
 
-    opal_finalize ();
+    opal_finalize_util ();
 
     return test_finalize ();
 }