diff --git a/utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java b/utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java
index e42c5d4f849..5cce309e76e 100644
--- a/utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java
+++ b/utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java
@@ -22,6 +22,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -547,7 +548,7 @@ public class SMTPMailSenderTest extends TestCase {
     public void setMailRecipientsTest() throws UnsupportedEncodingException, MessagingException {
         SMTPMessage messageMock = new SMTPMessage(Mockito.mock(MimeMessage.class));
 
-        Set<MailAddress> recipients = new HashSet<>();
+        Set<MailAddress> recipients = new LinkedHashSet<>();
         recipients.add(new MailAddress(null));
         recipients.add(new MailAddress(""));
         recipients.add(new MailAddress("  "));
diff --git a/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java b/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
index 9291188b5b5..4a2a2a6989b 100644
--- a/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
+++ b/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
@@ -175,8 +175,10 @@ public class ReflectionToStringBuilderUtilsTest extends TestCase {
     public void validateGetNonSelectedFieldsObjectIsNotACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
         String fieldToRemove = classToReflectRemovedField;
         String[] expectedResult = classToReflectFieldsNamesArray;
+        Arrays.sort(expectedResult);
 
         String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields("test", fieldToRemove);
+        Arrays.sort(result);
         Assert.assertArrayEquals(expectedResult, result);
     }
 
@@ -184,8 +186,10 @@ public class ReflectionToStringBuilderUtilsTest extends TestCase {
     public void validateGetNonSelectedFieldsObjectIsACollectionAndValidSelectedFieldsMustReturnNonSelectedFields(){
         String fieldToRemove = classToReflectRemovedField;
         String[] expectedResult = classToReflectFieldsNamesArray;
+        Arrays.sort(expectedResult);
 
         String[] result = ReflectionToStringBuilderUtils.getNonSelectedFields(Arrays.asList("test1", "test2"), fieldToRemove);
+        Arrays.sort(result);
         Assert.assertArrayEquals(expectedResult, result);
     }