diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java
index ae9f91ab4a..c55f9a0f31 100644
--- a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java
@@ -8,11 +8,17 @@
  */
 package com.owncloud.android.lib.common.operations;
 
+import static com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation.SPACE_UNLIMITED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.common.Quota;
 import com.owncloud.android.lib.common.UserInfo;
+import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
+import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;
 
 import org.junit.Test;
@@ -32,8 +38,19 @@ public void testGetUserQuota() {
 
         UserInfo userInfo = result.getResultData();
         Quota quota = userInfo.getQuota();
-        assertTrue(quota.getFree() >= 0);
+
+        assertNotNull(quota);
+
+        OCCapability capability = (OCCapability) new GetCapabilitiesRemoteOperation()
+            .execute(nextcloudClient).getSingleData();
+
+        if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_31)) {
+            assertEquals(SPACE_UNLIMITED, quota.getFree());
+            assertEquals(SPACE_UNLIMITED, quota.getTotal());
+        } else {
+            assertTrue(quota.getFree() >= 0);
+            assertTrue(quota.getTotal() > 0);
+        }
         assertTrue(quota.getUsed() >= 0);
-        assertTrue(quota.getTotal() > 0);
     }
 }