diff --git a/test/failure_handler/src/share/conf/common.properties b/test/failure_handler/src/share/conf/common.properties
index 75a3be5b070..b1f65c05f17 100644
--- a/test/failure_handler/src/share/conf/common.properties
+++ b/test/failure_handler/src/share/conf/common.properties
@@ -35,7 +35,7 @@ onTimeout=\
         jcmd.vm.symboltable jcmd.vm.uptime jcmd.vm.dynlibs \
         jcmd.vm.system_properties \
   jcmd.gc.heap_info jcmd.gc.class_histogram jcmd.gc.finalizer_info jcmd.thread.dump_to_file \
-  jstack jhsdb.jstack.live
+  jstack jhsdb.jstack.live.default jhsdb.jstack.live.mixed
 
 jinfo.app=jinfo
 
@@ -64,12 +64,14 @@ jstack.args=-e -l %p
 jstack.params.repeat=6
 
 jhsdb.app=jhsdb
-jhsdb.jstack.live.args=jstack --mixed --pid %p
-jhsdb.jstack.live.params.repeat=6
+jhsdb.jstack.live.default.args=jstack --pid %p
+jhsdb.jstack.live.default.params.repeat=6
+jhsdb.jstack.live.mixed.args=jstack --mixed --pid %p
+jhsdb.jstack.live.mixed.params.repeat=6
 
-cores=jhsdb.jstack.core jhsdb.jstack.core.mixed
+cores=jhsdb.jstack.core.default jhsdb.jstack.core.mixed
 # Assume that java standard laucher has been used
-jhsdb.jstack.core.args=jstack --core %p --exe %java
+jhsdb.jstack.core.default.args=jstack --core %p --exe %java
 jhsdb.jstack.core.mixed.args=jstack --mixed --core %p --exe %java
 
 ################################################################################