diff --git a/cloudinary-core/src/main/java/com/cloudinary/Api.java b/cloudinary-core/src/main/java/com/cloudinary/Api.java
index 83ad486a..c85192df 100644
--- a/cloudinary-core/src/main/java/com/cloudinary/Api.java
+++ b/cloudinary-core/src/main/java/com/cloudinary/Api.java
@@ -259,13 +259,17 @@ public ApiResponse createUploadPreset(Map options) throws Exception {
     public ApiResponse rootFolders(Map options) throws Exception {
         if (options == null)
             options = ObjectUtils.emptyMap();
-        return callApi(HttpMethod.GET, Arrays.asList("folders"), ObjectUtils.emptyMap(), options);
+        return callApi(HttpMethod.GET, Arrays.asList("folders"),
+                extractParams(options, Arrays.asList("max_results", "next_cursor")),
+                options);
     }
 
     public ApiResponse subFolders(String ofFolderPath, Map options) throws Exception {
         if (options == null)
             options = ObjectUtils.emptyMap();
-        return callApi(HttpMethod.GET, Arrays.asList("folders", ofFolderPath), ObjectUtils.emptyMap(), options);
+        return callApi(HttpMethod.GET, Arrays.asList("folders", ofFolderPath),
+                extractParams(options, Arrays.asList("max_results", "next_cursor")),
+                options);
     }
 
     //Creates an empty folder
@@ -659,4 +663,16 @@ public ApiResponse deleteMetadataField(String fieldExternalId) throws Exception
         List<String> uri = Arrays.asList("metadata_fields", fieldExternalId);
         return callApi(HttpMethod.DELETE, uri, Collections.<String, Object>emptyMap(), Collections.emptyMap());
     }
+
+    private Map<String, ?> extractParams(Map options, List<String> keys) {
+        Map<String, Object> result = new HashMap<String, Object>();
+        for (String key : keys) {
+            Object option = options.get(key);
+
+            if (option != null) {
+                result.put(key, option);
+            }
+        }
+        return result;
+    }
 }
diff --git a/cloudinary-http42/src/test/java/com/cloudinary/test/FoldersApiTest.java b/cloudinary-http42/src/test/java/com/cloudinary/test/FoldersApiTest.java
new file mode 100644
index 00000000..971bcf39
--- /dev/null
+++ b/cloudinary-http42/src/test/java/com/cloudinary/test/FoldersApiTest.java
@@ -0,0 +1,4 @@
+package com.cloudinary.test;
+
+public class FoldersApiTest extends AbstractFoldersApiTest {
+}
diff --git a/cloudinary-http43/src/test/java/com/cloudinary/test/FoldersApiTest.java b/cloudinary-http43/src/test/java/com/cloudinary/test/FoldersApiTest.java
new file mode 100644
index 00000000..971bcf39
--- /dev/null
+++ b/cloudinary-http43/src/test/java/com/cloudinary/test/FoldersApiTest.java
@@ -0,0 +1,4 @@
+package com.cloudinary.test;
+
+public class FoldersApiTest extends AbstractFoldersApiTest {
+}
diff --git a/cloudinary-http44/src/test/java/com/cloudinary/test/FoldersApiTest.java b/cloudinary-http44/src/test/java/com/cloudinary/test/FoldersApiTest.java
new file mode 100644
index 00000000..971bcf39
--- /dev/null
+++ b/cloudinary-http44/src/test/java/com/cloudinary/test/FoldersApiTest.java
@@ -0,0 +1,4 @@
+package com.cloudinary.test;
+
+public class FoldersApiTest extends AbstractFoldersApiTest {
+}
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java
new file mode 100644
index 00000000..4ccf2903
--- /dev/null
+++ b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractFoldersApiTest.java
@@ -0,0 +1,88 @@
+package com.cloudinary.test;
+
+import com.cloudinary.Api;
+import com.cloudinary.Cloudinary;
+import com.cloudinary.api.ApiResponse;
+import com.cloudinary.utils.ObjectUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeNotNull;
+
+@SuppressWarnings({"rawtypes"})
+abstract public class AbstractFoldersApiTest extends MockableTest {
+    protected Api api;
+
+    @Rule
+    public TestName currentTest = new TestName();
+
+    @Before
+    public void setUp() {
+        System.out.println("Running " + this.getClass().getName() + "." + currentTest.getMethodName());
+        this.cloudinary = new Cloudinary();
+        assumeNotNull(cloudinary.config.apiSecret);
+        this.api = cloudinary.api();
+    }
+
+    @Test
+    public void testRootFolderWithParams() throws Exception {
+        String rootFolder1Name = "rootFolderWithParamsTest1" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(rootFolder1Name, null).get("success"));
+
+        String rootFolder2Name = "rootFolderWithParamsTest2" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(rootFolder2Name, null).get("success"));
+
+        Thread.sleep(500);
+
+        ApiResponse rootResponse1 = api.rootFolders(ObjectUtils.asMap("max_results", 1));
+        List rootFolders1 = (List) rootResponse1.get("folders");
+        assertNotNull(rootFolders1);
+        assertEquals(1, rootFolders1.size());
+
+        String nextCursor = (String) rootResponse1.get("next_cursor");
+        assertNotNull(nextCursor);
+
+        ApiResponse rootResponse2 = api.rootFolders(ObjectUtils.asMap("max_results", 1, "next_cursor", nextCursor));
+        List folders2 = (List) rootResponse2.get("folders");
+        assertNotNull(folders2);
+        assertEquals(1, folders2.size());
+
+        assertTrue(((List) api.deleteFolder(rootFolder1Name, null).get("deleted")).contains(rootFolder1Name));
+        assertTrue(((List) api.deleteFolder(rootFolder2Name, null).get("deleted")).contains(rootFolder2Name));
+    }
+
+    @Test
+    public void testSubFolderWithParams() throws Exception {
+        String rootFolderName = "subfolderWithParamsTest" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(rootFolderName, null).get("success"));
+
+        String subFolder1Name = rootFolderName + "/subfolder1" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(subFolder1Name, null).get("success"));
+
+        String subFolder2Name = rootFolderName + "/subfolder2" + SUFFIX;
+        assertTrue((Boolean) api.createFolder(subFolder2Name, null).get("success"));
+
+        Thread.sleep(500);
+
+        ApiResponse response = api.subFolders(rootFolderName, ObjectUtils.asMap("max_results", 1));
+        List folders = (List) response.get("folders");
+        assertNotNull(folders);
+        assertEquals(1, folders.size());
+
+        String nextCursor = (String) response.get("next_cursor");
+        assertNotNull(nextCursor);
+
+        ApiResponse response2 = api.subFolders(rootFolderName, ObjectUtils.asMap("max_results", 1, "next_cursor", nextCursor));
+        List folders2 = (List) response2.get("folders");
+        assertNotNull(folders2);
+        assertEquals(1, folders2.size());
+
+        ApiResponse result = api.deleteFolder(rootFolderName, null);
+        assertTrue(((List) result.get("deleted")).contains(rootFolderName));
+    }
+}