diff --git a/application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
index 25df3bee00..d059ea1449 100644
--- a/application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
+++ b/application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
@@ -26,13 +26,13 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
-        "org.thingsboard.server.transport.*.rpc.sql.*Test",
-        "org.thingsboard.server.transport.*.telemetry.timeseries.sql.*Test",
-        "org.thingsboard.server.transport.*.telemetry.attributes.sql.*Test",
-        "org.thingsboard.server.transport.*.attributes.updates.sql.*Test",
-        "org.thingsboard.server.transport.*.attributes.request.sql.*Test",
-        "org.thingsboard.server.transport.*.claim.sql.*Test",
-        "org.thingsboard.server.transport.*.provision.sql.*Test",
+//        "org.thingsboard.server.transport.*.rpc.sql.*Test",
+//        "org.thingsboard.server.transport.*.telemetry.timeseries.sql.*Test",
+//        "org.thingsboard.server.transport.*.telemetry.attributes.sql.*Test",
+//        "org.thingsboard.server.transport.*.attributes.updates.sql.*Test",
+//        "org.thingsboard.server.transport.*.attributes.request.sql.*Test",
+//        "org.thingsboard.server.transport.*.claim.sql.*Test",
+//        "org.thingsboard.server.transport.*.provision.sql.*Test",
         "org.thingsboard.server.transport.lwm2m.*Test"
 })
 public class TransportSqlTestSuite {
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
index f54a6e3382..e94f432f64 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
@@ -148,10 +148,10 @@ public class NoSecLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
         LwM2MTestClient client = new LwM2MTestClient(executor, ENDPOINT);
         client.init(SECURITY, COAP_CONFIG);
 
-        device.setFirmwareId(firmware.getId());
-
         Thread.sleep(1000);
 
+        device.setFirmwareId(firmware.getId());
+
         device = doPost("/api/device", device, Device.class);
 
         Thread.sleep(1000);
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
index d03a666ed5..3f86131320 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
@@ -36,8 +36,8 @@ import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.server.LwM2MFirmwareUpdateStrategy;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
-import org.thingsboard.server.transport.lwm2m.server.UpdateStateFw;
 import org.thingsboard.server.transport.lwm2m.server.UpdateResultFw;
+import org.thingsboard.server.transport.lwm2m.server.UpdateStateFw;
 import org.thingsboard.server.transport.lwm2m.server.attributes.LwM2MAttributesService;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
@@ -200,6 +200,8 @@ public class DefaultLwM2MOtaUpdateService implements LwM2MOtaUpdateService {
             } else {
                 startFirmwareUpdateUsingBinary(client, fwInfo);
             }
+        } else if (fwInfo.isUpdateFailed()) {
+            sendStateUpdateToTelemetry(client, fwInfo, OtaPackageUpdateStatus.FAILED);
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
index 78ae7220e2..50b44f8d06 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
@@ -80,6 +80,11 @@ public class LwM2MClientOtaInfo {
         }
     }
 
+    public boolean isUpdateFailed() {
+        return (StringUtils.isNotEmpty(targetName) && StringUtils.isNotEmpty(targetVersion) &&
+                (StringUtils.isEmpty(currentName) && StringUtils.isEmpty(currentVersion)));
+    }
+
     public void setUpdateResult(UpdateResultFw updateResult) {
         this.updateResult = updateResult;
         switch (updateResult) {