diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 940e26796185..929632a07d01 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -33,8 +33,6 @@ start_docker_env
 execute_robot_test scm lib
 execute_robot_test scm ozone-lib
 
-execute_robot_test om auditparser
-
 execute_robot_test scm basic
 
 execute_robot_test scm gdpr
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-debug-tools.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-debug-tools.sh
index c54c17425b36..caa929bc6812 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-debug-tools.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-debug-tools.sh
@@ -25,6 +25,7 @@ export COMPOSE_DIR
 export SECURITY_ENABLED=true
 export OM_SERVICE_ID=omservice
 export SCM=scm1.org
+export OM=om1
 export COMPOSE_FILE=docker-compose.yaml:debug-tools.yaml
 export OZONE_DIR=/opt/hadoop
 
@@ -50,6 +51,10 @@ source "$COMPOSE_DIR/../testlib.sh"
 
 start_docker_env
 
+execute_robot_test ${OM} kinit.robot
+
+execute_robot_test ${OM} debug/auditparser.robot
+
 execute_robot_test ${SCM} kinit.robot
 
 source "$COMPOSE_DIR/../common/replicas-test.sh"
diff --git a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot b/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
similarity index 94%
rename from hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
rename to hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
index 5af45d97c552..c0d4ea9f4b30 100644
--- a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
@@ -28,9 +28,9 @@ ${auditworkdir}      /tmp
 
 *** Keywords ***
 Set username
-    ${hostname} =          Execute         hostname
-    Set Suite Variable     ${user}         testuser/${hostname}@EXAMPLE.COM
-    [return]               ${user}
+    ${principal} =     Get test user principal    testuser
+    Set Suite Variable    ${user}    ${principal}
+    [Return]      ${principal}
 
 Create data
     Freon OMBG    prefix=auditparser    n=${buckets}