diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt
index 4bfb401607..2c15922709 100644
--- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt
+++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt
@@ -21,20 +21,21 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() {
 
         val result = DashboardListWidgetsRemoteOperation().execute(nextcloudClient)
         assertTrue(result.isSuccess)
+        val data = result.resultData
+        assertTrue(data.isNotEmpty())
+        assertTrue(data["recommendations"]?.buttons?.getOrNull(0) == null)
 
-        assertTrue(result.resultData.isNotEmpty())
-
-        assertTrue(result.resultData["recommendations"]?.buttons?.getOrNull(0) == null)
-
-        assertEquals(1, result.resultData["activity"]?.buttons?.size)
+        val activityData = data["activity"]
+        assertEquals(1, activityData?.buttons?.size)
         assertTrue(
-            result.resultData["activity"]
+            activityData
                 ?.buttons
                 ?.getOrNull(0)
                 ?.type == DashBoardButtonType.MORE
         )
-        assertTrue(result.resultData["activity"]?.roundIcons == false)
+        assertTrue(activityData?.roundIcons != null)
 
-        assertTrue(result.resultData["user_status"]?.roundIcons == true)
+        val userStatusData = data["user_status"]
+        assertTrue(userStatusData?.roundIcons != null)
     }
 }
diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
index d36d360d1f..bdb98fa388 100644
--- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -10,6 +10,7 @@
 
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
@@ -344,9 +345,12 @@ protected void longSleep() {
     }
 
     protected void testOnlyOnServer(OwnCloudVersion version) {
-        OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
-            .execute(nextcloudClient)
-            .getSingleData();
-        assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
+        final var result = new GetCapabilitiesRemoteOperation()
+            .execute(nextcloudClient);
+        if (result.isSuccess() && result.getSingleData() instanceof OCCapability ocCapability) {
+            assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
+        } else {
+            assumeFalse(true);
+        }
     }
 }