diff --git a/lib/tests/behat/behat_filepicker.php b/repository/tests/behat/behat_filepicker.php
similarity index 99%
rename from lib/tests/behat/behat_filepicker.php
rename to repository/tests/behat/behat_filepicker.php
index 68a79b11d94..10c9b3f0241 100644
--- a/lib/tests/behat/behat_filepicker.php
+++ b/repository/tests/behat/behat_filepicker.php
@@ -25,7 +25,7 @@
 
 // NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
 
-require_once(__DIR__ . '/../../behat/behat_files.php');
+require_once(__DIR__ . '/../../../lib/behat/behat_files.php');
 
 use Behat\Mink\Exception\ExpectationException as ExpectationException;
 
diff --git a/repository/tests/behat/create_folders.feature b/repository/tests/behat/create_folders.feature
new file mode 100644
index 00000000000..d34712a19ab
--- /dev/null
+++ b/repository/tests/behat/create_folders.feature
@@ -0,0 +1,26 @@
+@core_form @filepicker
+Feature: Create folders in the file manager
+  In order to create a directory structure in a file area
+  As a moodle user
+  I need to create folders and subfolders in a file area
+
+  @javascript
+  Scenario: Create folders and subfolders
+    Given the following "courses" exists:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+    And I log in as "admin"
+    And I follow "Course 1"
+    And I turn editing mode on
+    And I add a "Folder" to section "0"
+    And I fill the moodle form with:
+      | Name | Folder resource |
+      | Description | The description |
+    And I create "Folder 1" folder in "Files" filepicker
+    And I open "Folder 1" folder from "Files" filepicker
+    And I create "SubFolder 1" folder in "Files" filepicker
+    When I open "Files" folder from "Files" filepicker
+    Then I should see "Folder 1"
+    And I open "Folder 1" folder from "Files" filepicker
+    And I should see "SubFolder 1"
+    And I press "Save and return to course"
diff --git a/admin/tool/behat/tests/behat/manipulate_filepicker.feature b/repository/tests/behat/zip_and_unzip.feature
similarity index 66%
rename from admin/tool/behat/tests/behat/manipulate_filepicker.feature
rename to repository/tests/behat/zip_and_unzip.feature
index b5b3d94cb9f..ff5f79a983e 100644
--- a/admin/tool/behat/tests/behat/manipulate_filepicker.feature
+++ b/repository/tests/behat/zip_and_unzip.feature
@@ -1,10 +1,11 @@
-@tool_behat @core_form @filepicker
-Feature: Manipulate filepicker
-  In order to provide external resources
+@core_form @filepicker
+Feature: Zip folders and unzip compressed files
+  In order to download or add contents to file areas easily
   As a moodle user
-  I need to upload files to moodle
+  I need to zip and unzip folders and files
 
-  Background:
+  @javascript
+  Scenario: Zip and unzip folders and files
     Given the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -18,18 +19,7 @@ Feature: Manipulate filepicker
     And I create "Folder 1" folder in "Files" filepicker
     And I open "Folder 1" folder from "Files" filepicker
     And I create "SubFolder 1" folder in "Files" filepicker
-
-  @javascript
-  Scenario: Create folders and subfolders
-    When I open "Files" folder from "Files" filepicker
-    Then I should see "Folder 1"
-    And I open "Folder 1" folder from "Files" filepicker
-    And I should see "SubFolder 1"
-    And I press "Save and return to course"
-
-  @javascript
-  Scenario: Zip and unzip folders and files
-    Given I open "Files" folder from "Files" filepicker
+    And I open "Files" folder from "Files" filepicker
     And I zip "Folder 1" folder from "Files" filepicker
     And I delete "Folder 1" from "Files" filepicker
     When I unzip "Folder 1.zip" file from "Files" filepicker