diff --git a/tests/broker-engine/services-and-bulk-stmt.robot b/tests/broker-engine/services-and-bulk-stmt.robot
index 28bd181d867..241f3c3a7e0 100644
--- a/tests/broker-engine/services-and-bulk-stmt.robot
+++ b/tests/broker-engine/services-and-bulk-stmt.robot
@@ -444,7 +444,7 @@ EBMSSMDBD
     ...    The rrd output is removed from the broker configuration.
     ...    While metrics are written in the database, we stop the database and then restart it.
     ...    Broker must recover its connection to the database and continue to write metrics.
-    [Tags]    broker    engine    unified_sql    MON-152743
+    [Tags]    broker    engine    unified_sql    MON-153321
     Ctn Clear Metrics
     Ctn Config Engine    ${1}    ${1}    ${1000}
     # We want all the services to be passive to avoid parasite checks during our test.
@@ -487,13 +487,13 @@ EBMSSMDBD
     Log To Console    Let's start some database manipulation...
     ${start}    Get Current Date
 
-    FOR    ${i}    IN RANGE    ${120}
-	Start Process    /usr/bin/bash    /root/mv_data_bin.sh    alias=mv_data_bin
+    FOR    ${i}    IN RANGE    ${3}
+        Ctn Stop Mysql
+	Sleep    10s
+	Ctn Start Mysql
 	${content}    Create List    could not insert data in data_bin
 	${result}    Ctn Find In Log With Timeout    ${centralLog}    ${start}    ${content}    10
 	Log To Console    ${result}
-	${result}    Wait For Process    mv_data_bin
-	Log To Console    ${result}
     END
 
 *** Keywords ***
diff --git a/tests/resources/resources.resource b/tests/resources/resources.resource
index 474c70b1d4f..ac2e0ae7d50 100644
--- a/tests/resources/resources.resource
+++ b/tests/resources/resources.resource
@@ -370,13 +370,14 @@ Ctn Dump Ba On Error
 
 Ctn Process Service Result Hard
     [Arguments]    ${host}    ${svc}    ${state}    ${output}
-    Repeat Keyword
-    ...    3 times
-    ...    Ctn Process Service Check Result
-    ...    ${host}
-    ...    ${svc}
-    ...    ${state}
-    ...    ${output}
+    FOR    ${idx}    IN RANGE    3
+        Ctn Process Service Check Result
+        ...    ${host}
+        ...    ${svc}
+        ...    ${state}
+        ...    ${output}
+        Sleep    1s
+    END
 
 Ctn Wait For Engine To Be Ready
     [Arguments]    ${start}    ${nbEngine}=1
@@ -386,7 +387,7 @@ Ctn Wait For Engine To Be Ready
         ${result}    Ctn Find In Log With Timeout
         ...    ${ENGINE_LOG}/config${i}/centengine.log
         ...    ${start}    ${content}    60
-	...    verbose=False
+        ...    verbose=False
         Should Be True
         ...    ${result}
         ...    A message telling check_for_external_commands() should be available in config${i}/centengine.log.