diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
index fc1c976664..3bbe6f22ab 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
@@ -138,7 +138,7 @@ public abstract class BaseDeviceCredentialsCacheTest extends AbstractServiceTest
             Object target = ((Advised) deviceCredentialsService).getTargetSource().getTarget();
             return (DeviceCredentialsService) target;
         }
-        return null;
+        return deviceCredentialsService;
     }
 
     private DeviceCredentials createDummyDeviceCredentialsEntity(String deviceCredentialsId) {
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java
index 17dc127edb..4ef6df8015 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java
@@ -68,7 +68,7 @@ public abstract class BaseRelationCacheTest extends AbstractServiceTest {
             Object target = ((Advised) relationService).getTargetSource().getTarget();
             return (RelationService) target;
         }
-        return null;
+        return relationService;
     }
 
     @Test