diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java
index 05873c8bc133..d7904e198fc6 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java
@@ -167,7 +167,7 @@ public void cancel() {
         ConflictsResolveActivity sut = activityRule.launchActivity(intent);
 
         sut.listener = decision -> {
-            assertEquals(decision, ConflictsResolveDialog.Decision.CANCEL);
+            assertEquals(ConflictsResolveDialog.Decision.CANCEL, decision);
             returnCode = true;
         };
 
@@ -210,7 +210,7 @@ public void keepExisting() {
         ConflictsResolveActivity sut = activityRule.launchActivity(intent);
 
         sut.listener = decision -> {
-            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_SERVER);
+            assertEquals(ConflictsResolveDialog.Decision.KEEP_SERVER, decision);
             returnCode = true;
         };
 
@@ -256,7 +256,7 @@ public void keepNew() {
         ConflictsResolveActivity sut = activityRule.launchActivity(intent);
 
         sut.listener = decision -> {
-            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_LOCAL);
+            assertEquals(ConflictsResolveDialog.Decision.KEEP_LOCAL, decision);
             returnCode = true;
         };
 
@@ -303,7 +303,7 @@ public void keepBoth() {
         ConflictsResolveActivity sut = activityRule.launchActivity(intent);
 
         sut.listener = decision -> {
-            assertEquals(decision, ConflictsResolveDialog.Decision.KEEP_BOTH);
+            assertEquals(ConflictsResolveDialog.Decision.KEEP_BOTH, decision);
             returnCode = true;
         };
 
diff --git a/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java b/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java
index b173b5841269..81706dcbe141 100644
--- a/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java
@@ -79,6 +79,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertArrayEquals;
 
 public class EncryptionTestIT extends AbstractIT {
     @Rule public RetryTestRule retryTestRule = new RetryTestRule();
@@ -149,7 +150,7 @@ public void encryptStringAsymmetric() throws Exception {
 
         byte[] key2 = decodeStringToBase64Bytes(decryptedString);
 
-        assertTrue(Arrays.equals(key1, key2));
+        assertArrayEquals(key1, key2);
     }
 
     @Test
@@ -164,7 +165,7 @@ public void encryptStringAsymmetricCorrectPublicKey() throws Exception {
 
         byte[] key2 = decodeStringToBase64Bytes(decryptedString);
 
-        assertTrue(Arrays.equals(key1, key2));
+        assertArrayEquals(key1, key2);
     }
 
     @Test(expected = BadPaddingException.class)