diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
index 6e195b266c..259544d3c0 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
@@ -15,7 +15,8 @@
  */
 package org.thingsboard.server.dao.service;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
 public class DataValidatorTest {
@@ -26,38 +27,50 @@ public class DataValidatorTest {
         DataValidator.validateEmail(email);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail1() {
         String email = "test:1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail2() {
         String email = "test()1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail3() {
         String email = "test[]1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail4() {
         String email = "test\\1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail5() {
         String email = "test\"1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail6() {
         String email = "test<>1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 }
\ No newline at end of file