diff --git a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java
index 65076a8f0d3..d33e84f37c9 100644
--- a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java
+++ b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java
@@ -249,10 +249,12 @@ public void mqttClientConnect() {
         MqttConnectOptions clientOpts = new MqttConnectOptions();
         clientOpts.setUserName(CLIENT_USER);
         clientOpts.setPassword(CLIENT_PASSWORD.toCharArray());
+        clientOpts.setAutomaticReconnect(true);
 
         MqttConnectOptions serverOpts = new MqttConnectOptions();
         serverOpts.setUserName(SERVER_USER);
         serverOpts.setPassword(SERVER_PASSWORD.toCharArray());
+        serverOpts.setAutomaticReconnect(true);
 
         try {
             mqttClient.connect(clientOpts);