Index: testsuite/src/main/org/jboss/test/jmx/shutdown/ExitOnShutdown.java
===================================================================
--- testsuite/src/main/org/jboss/test/jmx/shutdown/ExitOnShutdown.java	(revision 87032)
+++ testsuite/src/main/org/jboss/test/jmx/shutdown/ExitOnShutdown.java	(working copy)
@@ -53,5 +53,7 @@
          }
       }, "ExitOnShutdown");
       thread.start();
+      // JBAS-6759: make sure we call System.exit before we're undeployed
+      thread.join(5000);
    }
 }