diff --git a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
index 391448864db0..43860b75d996 100644
--- a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
@@ -71,17 +71,17 @@ Check if Recon picks up OM data
 Check if Recon picks up DN heartbeats
     ${result} =         Execute                             curl --negotiate -u : -LSs ${API_ENDPOINT_URL}/datanodes
                         Should contain      ${result}       datanodes
-                        Should contain      ${result}       datanode_1
-                        Should contain      ${result}       datanode_2
-                        Should contain      ${result}       datanode_3
+                        Should Match Regexp    ${result}    datanode[-_]1
+                        Should Match Regexp    ${result}    datanode[-_]2
+                        Should Match Regexp    ${result}    datanode[-_]3
 
     ${result} =         Execute                             curl --negotiate -u : -LSs ${API_ENDPOINT_URL}/pipelines
                         Should contain      ${result}       pipelines
                         Should contain      ${result}       RATIS
                         Should contain      ${result}       OPEN
-                        Should contain      ${result}       datanode_1
-                        Should contain      ${result}       datanode_2
-                        Should contain      ${result}       datanode_3
+                        Should Match Regexp    ${result}    datanode[-_]1
+                        Should Match Regexp    ${result}    datanode[-_]2
+                        Should Match Regexp    ${result}    datanode[-_]3
 
     ${result} =         Execute                             curl --negotiate -u : -LSs ${API_ENDPOINT_URL}/clusterState
                         Should contain      ${result}       \"totalDatanodes\"
diff --git a/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot b/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
index 3af6fd120ae4..3a20c910461c 100644
--- a/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
@@ -22,18 +22,29 @@ Test Timeout        5 minutes
 
 *** Variables ***
 
+*** Keywords ***
+Validate PrintTopology Output
+    [Arguments]           ${output}
+    Should Contain        ${output}         State = HEALTHY
+    Should Contain        ${output}         IN_SERVICE
+    Should Match Regexp   ${output}         .*ozone.*datanode[-_]\\d+.*IN_SERVICE.*rack.*
+
 
 *** Test Cases ***
 Run printTopology
     ${output} =         Execute          ozone admin printTopology
-                        Should contain   ${output}         10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
+                        Validate PrintTopology Output    ${output}
+
 Run printTopology -o
     ${output} =         Execute          ozone admin printTopology -o
-                        Should contain   ${output}         Location: /rack2
-                        Should contain   ${output}         10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE
+                        Should Match Regexp   ${output}         Location: /.*rack.*
+                        Should Match Regexp   ${output}         .*ozone.*datanode[-_]\\d+.*IN_SERVICE.*
+
 Run printTopology --operational-state IN_SERVICE
     ${output} =         Execute          ozone admin printTopology --operational-state IN_SERVICE
-                        Should contain   ${output}         10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
+                        Validate PrintTopology Output    ${output}
+
 Run printTopology --node-state HEALTHY
     ${output} =         Execute          ozone admin printTopology --node-state HEALTHY
-                        Should contain   ${output}         10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
\ No newline at end of file
+                        Validate PrintTopology Output    ${output}
+