diff --git a/src/docs/show-help-files/help-prte.rst b/src/docs/show-help-files/help-prte.rst
index 5c50fcfc72..76c1b012b8 100644
--- a/src/docs/show-help-files/help-prte.rst
+++ b/src/docs/show-help-files/help-prte.rst
@@ -1,6 +1,6 @@
 .. -*- rst -*-
 
-   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
    Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
 
    $COPYRIGHT$
@@ -79,9 +79,6 @@ option to the help request as ``--help <option>``.
    * - ``--leave-session-attached``
      - Do not discard stdout/stderr of remote PRRTE daemons
 
-   * - ``--test-suicide <arg0>``
-     - Direct that the specified daemon suicide after delay
-
    * - ``--display <arg0>``
      - Comma-delimited list of options for displaying information
 
diff --git a/src/docs/show-help-files/help-prterun.rst b/src/docs/show-help-files/help-prterun.rst
index 860e679ba3..019d7eabba 100644
--- a/src/docs/show-help-files/help-prterun.rst
+++ b/src/docs/show-help-files/help-prterun.rst
@@ -1,6 +1,6 @@
 .. -*- rst -*-
 
-   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
    Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
 
    $COPYRIGHT$
@@ -107,9 +107,6 @@ option to the help request as ``--help <option>``.
      - Direct the specified processes to stop at an
        application-controlled location
 
-   * - ``--test-suicide <arg0>``
-     - Direct that the specified daemon suicide after delay
-
    * - ``--do-not-launch``
      - Perform all necessary operations to prepare to launch the
        application, but do not actually launch it (usually used to
diff --git a/src/mca/schizo/prte/schizo_prte.c b/src/mca/schizo/prte/schizo_prte.c
index aa8aacf6a4..0f2483666a 100644
--- a/src/mca/schizo/prte/schizo_prte.c
+++ b/src/mca/schizo/prte/schizo_prte.c
@@ -18,7 +18,7 @@
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018-2022 IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
+ * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -98,7 +98,6 @@ static struct option prteoptions[] = {
     PMIX_OPTION_DEFINE(PRTE_CLI_SET_SID, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_PID, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_URI, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_TEST_SUICIDE, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_DEFAULT_HOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_SINGLETON, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_KEEPALIVE, PMIX_ARG_REQD),
@@ -152,7 +151,6 @@ static struct option prterunoptions[] = {
     PMIX_OPTION_DEFINE(PRTE_CLI_SET_SID, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_PID, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_URI, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_TEST_SUICIDE, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_DEFAULT_HOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_KEEPALIVE, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_LAUNCH_AGENT, PMIX_ARG_REQD),
diff --git a/src/runtime/prte_globals.c b/src/runtime/prte_globals.c
index 83c4446e0f..9274838f0b 100644
--- a/src/runtime/prte_globals.c
+++ b/src/runtime/prte_globals.c
@@ -89,7 +89,7 @@ bool prte_show_resolved_nodenames = false;
 bool prte_do_not_resolve = false;
 int prte_hostname_cutoff = 1000;
 
-int prted_debug_failure = -1;
+pmix_rank_t prted_debug_failure = PMIX_RANK_INVALID;
 int prted_debug_failure_delay = -1;
 bool prte_never_launched = false;
 bool prte_devel_level_output = false;
diff --git a/src/runtime/prte_globals.h b/src/runtime/prte_globals.h
index 2d1990e450..35cd01491c 100644
--- a/src/runtime/prte_globals.h
+++ b/src/runtime/prte_globals.h
@@ -524,7 +524,7 @@ PRTE_EXPORT extern int prte_hostname_cutoff;
 PRTE_EXPORT extern bool prte_do_not_resolve;
 
 /* debug flags */
-PRTE_EXPORT extern int prted_debug_failure;
+PRTE_EXPORT extern pmix_rank_t prted_debug_failure;
 PRTE_EXPORT extern int prted_debug_failure_delay;
 
 PRTE_EXPORT extern bool prte_never_launched;
diff --git a/src/tools/prte/prte.c b/src/tools/prte/prte.c
index 2039880f08..eaddf6ab50 100644
--- a/src/tools/prte/prte.c
+++ b/src/tools/prte/prte.c
@@ -99,6 +99,7 @@
 #include "src/mca/schizo/base/base.h"
 #include "src/mca/state/base/base.h"
 #include "src/runtime/prte_globals.h"
+#include "src/runtime/prte_wait.h"
 #include "src/runtime/runtime.h"
 
 #include "include/prte.h"
@@ -228,6 +229,32 @@ static void setup_sighandler(int signal, prte_event_t *ev, prte_event_cbfunc_t c
     prte_event_signal_add(ev, NULL);
 }
 
+static void shutdown_callback(int fd, short flags, void *arg)
+{
+    prte_timer_t *tm = (prte_timer_t *) arg;
+    prte_job_t *jdata;
+    PRTE_HIDE_UNUSED_PARAMS(fd, flags);
+
+    if (NULL != tm) {
+        /* release the timer */
+        PMIX_RELEASE(tm);
+    }
+
+    /* if we were ordered to abort, do so */
+    pmix_output(0, "%s is executing clean abnormal termination",
+                PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
+    /* do -not- call finalize as this will send a message to the HNP
+     * indicating clean termination! Instead, just forcibly cleanup
+     * the local session_dir tree and exit
+     */
+    prte_odls.kill_local_procs(NULL);
+    // mark that we are finalizing so the session directory will cleanup
+    prte_finalizing = true;
+    jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
+    PMIX_RELEASE(jdata);
+    exit(PRTE_ERROR_DEFAULT_EXIT_CODE);
+}
+
 int main(int argc, char *argv[])
 {
     int rc = 1, i;
@@ -850,6 +877,35 @@ int main(int argc, char *argv[])
         goto DONE;
     }
 
+    // see if we are to suicide
+    if (PMIX_RANK_INVALID != prted_debug_failure) {
+        /* are we the specified vpid? */
+        if (PRTE_PROC_MY_NAME->rank == prted_debug_failure ||
+            prted_debug_failure == PMIX_RANK_WILDCARD) {
+            /* if the user specified we delay, then setup a timer
+             * and have it kill us
+             */
+            if (0 < prted_debug_failure_delay) {
+                PRTE_TIMER_EVENT(prted_debug_failure_delay, 0, shutdown_callback);
+
+            } else {
+                pmix_output(0, "%s is executing clean abnormal termination",
+                            PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
+
+                /* do -not- call finalize as this will send a message to the HNP
+                 * indicating clean termination! Instead, just forcibly cleanup
+                 * the local session_dir tree and exit
+                 */
+                jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
+                PMIX_RELEASE(jdata);
+
+                /* return with non-zero status */
+                ret = PRTE_ERROR_DEFAULT_EXIT_CODE;
+                goto DONE;
+            }
+        }
+    }
+
     opt = pmix_cmd_line_get_param(&results, PRTE_CLI_REPORT_PID);
     if (NULL != opt) {
         /* if the string is a "-", then output to stdout */
diff --git a/src/tools/prted/prted.c b/src/tools/prted/prted.c
index 9fa68faa4c..f026536723 100644
--- a/src/tools/prted/prted.c
+++ b/src/tools/prted/prted.c
@@ -125,7 +125,6 @@ static void report_prted(void);
 static pmix_data_buffer_t *bucket, *mybucket = NULL;
 static int ncollected = 0;
 static bool node_regex_waiting = false;
-static bool prted_abort = false;
 static char *prte_parent_uri = NULL;
 static pmix_cli_result_t results;
 
@@ -415,18 +414,10 @@ int main(int argc, char *argv[])
         }
     }
 
-    if ((int) PMIX_RANK_INVALID != prted_debug_failure) {
-        prted_abort = false;
-        /* some vpid was ordered to fail. The value can be positive
-         * or negative, depending upon the desired method for failure,
-         * so need to check both here
-         */
-        if (0 > prted_debug_failure) {
-            prted_debug_failure = -1 * prted_debug_failure;
-            prted_abort = true;
-        }
+    if (PMIX_RANK_INVALID != prted_debug_failure) {
         /* are we the specified vpid? */
-        if ((int) PRTE_PROC_MY_NAME->rank == prted_debug_failure) {
+        if (PRTE_PROC_MY_NAME->rank == prted_debug_failure ||
+            prted_debug_failure == PMIX_RANK_WILDCARD) {
             /* if the user specified we delay, then setup a timer
              * and have it kill us
              */
@@ -434,8 +425,8 @@ int main(int argc, char *argv[])
                 PRTE_TIMER_EVENT(prted_debug_failure_delay, 0, shutdown_callback);
 
             } else {
-                pmix_output(0, "%s is executing clean %s", PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                            prted_abort ? "abort" : "abnormal termination");
+                pmix_output(0, "%s is executing clean abnormal termination",
+                            PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
 
                 /* do -not- call finalize as this will send a message to the HNP
                  * indicating clean termination! Instead, just forcibly cleanup
@@ -444,12 +435,7 @@ int main(int argc, char *argv[])
                 jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
                 PMIX_RELEASE(jdata);
 
-                /* if we were ordered to abort, do so */
-                if (prted_abort) {
-                    abort();
-                }
-
-                /* otherwise, return with non-zero status */
+                /* return with non-zero status */
                 ret = PRTE_ERROR_DEFAULT_EXIT_CODE;
                 goto DONE;
             }
@@ -822,7 +808,6 @@ int main(int argc, char *argv[])
 static void shutdown_callback(int fd, short flags, void *arg)
 {
     prte_timer_t *tm = (prte_timer_t *) arg;
-    bool suicide = false;
     prte_job_t *jdata;
     PRTE_HIDE_UNUSED_PARAMS(fd, flags);
 
@@ -832,24 +817,6 @@ static void shutdown_callback(int fd, short flags, void *arg)
     }
 
     /* if we were ordered to abort, do so */
-    if (prted_abort) {
-        if (pmix_cmd_line_is_taken(&results, PRTE_CLI_TEST_SUICIDE)) {
-            suicide = true;
-        }
-        pmix_output(0, "%s is executing %s abort", PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                    suicide ? "suicide" : "clean");
-        /* do -not- call finalize as this will send a message to the HNP
-         * indicating clean termination! Instead, just kill our
-         * local procs, forcibly cleanup the local session_dir tree, and abort
-         */
-        if (suicide) {
-            exit(1);
-        }
-        prte_odls.kill_local_procs(NULL);
-        jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
-        PMIX_RELEASE(jdata);
-        abort();
-    }
     pmix_output(0, "%s is executing clean abnormal termination",
                 PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
     /* do -not- call finalize as this will send a message to the HNP
@@ -857,6 +824,8 @@ static void shutdown_callback(int fd, short flags, void *arg)
      * the local session_dir tree and exit
      */
     prte_odls.kill_local_procs(NULL);
+    // mark that we are finalizing so the session directory will cleanup
+    prte_finalizing = true;
     jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
     PMIX_RELEASE(jdata);
     exit(PRTE_ERROR_DEFAULT_EXIT_CODE);
diff --git a/src/util/session_dir.c b/src/util/session_dir.c
index 3a6f183fae..a090417fda 100644
--- a/src/util/session_dir.c
+++ b/src/util/session_dir.c
@@ -327,7 +327,7 @@ void prte_job_session_dir_finalize(prte_job_t *jdata)
     if (PMIX_CHECK_NSPACE(PRTE_PROC_MY_NAME->nspace, jdata->nspace)) {
         if (prte_finalizing) {
             if (NULL != prte_process_info.top_session_dir) {
-                pmix_os_dirpath_destroy(prte_process_info.top_session_dir, false, _check_file);
+                pmix_os_dirpath_destroy(prte_process_info.top_session_dir, true, _check_file);
                 rmdir(prte_process_info.top_session_dir);
                 free(prte_process_info.top_session_dir);
                 prte_process_info.top_session_dir = NULL;
@@ -336,7 +336,7 @@ void prte_job_session_dir_finalize(prte_job_t *jdata)
         return;
     }
 
-    pmix_os_dirpath_destroy(jdata->session_dir, false, _check_file);
+    pmix_os_dirpath_destroy(jdata->session_dir, true, _check_file);
     /* if the job-level session dir is now empty, remove it */
     rmdir(jdata->session_dir);
     free(jdata->session_dir);