diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c b/orte/tools/orte-checkpoint/orte-checkpoint.c
index b6323af76e..625ba13e39 100644
--- a/orte/tools/orte-checkpoint/orte-checkpoint.c
+++ b/orte/tools/orte-checkpoint/orte-checkpoint.c
@@ -578,7 +578,7 @@ static int ckpt_init(int argc, char *argv[]) {
      * JJH XXX This is a bandaid until we do it right.
      * JJH XXX
      */
-    if (ORTE_SUCCESS != (ret = orte_system_init(true)) ) {
+    if (ORTE_SUCCESS != (ret = orte_system_init(ORTE_INFRASTRUCTURE, ORTE_NON_BARRIER)) ) {
         exit_status = ret;
         goto cleanup;
     }
diff --git a/orte/tools/orte-restart/orte-restart.c b/orte/tools/orte-restart/orte-restart.c
index 18c29e22f1..ca38ddfc83 100644
--- a/orte/tools/orte-restart/orte-restart.c
+++ b/orte/tools/orte-restart/orte-restart.c
@@ -269,7 +269,7 @@ static int initialize(int argc, char *argv[]) {
                 true, &environ);
     opal_cr_set_enabled(false);
 
-    if (OPAL_SUCCESS != (ret = orte_init(true))) {
+    if (OPAL_SUCCESS != (ret = orte_init(ORTE_INFRASTRUCTURE, ORTE_NON_BARRIER))) {
         exit_status = ret;
         goto cleanup;
     }