diff --git a/admin/tests/behat/upload_users.feature b/admin/tests/behat/upload_users.feature
index ae9d83beed0..3b31da5f01c 100644
--- a/admin/tests/behat/upload_users.feature
+++ b/admin/tests/behat/upload_users.feature
@@ -1,4 +1,4 @@
-@core @core_admin @_only_local
+@core @core_admin @_only_local @_file_upload
 Feature: Upload users
   In order to add users to the system
   As an admin
diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature
index 9d4b5faf244..2f4e1626ba9 100644
--- a/badges/tests/behat/add_badge.feature
+++ b/badges/tests/behat/add_badge.feature
@@ -1,4 +1,4 @@
-@core @core_badges @_only_local
+@core @core_badges @_only_local @_file_upload
 Feature: Add badges to the system
   In order to give badges to users for their achievements
   As an admin
diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature
index d34d36e5201..d536211f15b 100644
--- a/badges/tests/behat/award_badge.feature
+++ b/badges/tests/behat/award_badge.feature
@@ -1,4 +1,4 @@
-@core @core_badges @_only_local
+@core @core_badges @_only_local @_file_upload
 Feature: Award badges
   In order to award badges to users for their achievements
   As an admin
diff --git a/cohort/tests/behat/upload_cohort_users.feature b/cohort/tests/behat/upload_cohort_users.feature
index 47b169a29d7..879ad8c99b5 100644
--- a/cohort/tests/behat/upload_cohort_users.feature
+++ b/cohort/tests/behat/upload_cohort_users.feature
@@ -1,4 +1,4 @@
-@core @core_cohort @_only_local
+@core @core_cohort @_only_local @_file_upload
 Feature: Upload users to a cohort
   In order to quickly fill site-wide groups with users
   As an admin
diff --git a/group/tests/behat/groups_import.feature b/group/tests/behat/groups_import.feature
index c6a0782c959..b8ae29e410b 100644
--- a/group/tests/behat/groups_import.feature
+++ b/group/tests/behat/groups_import.feature
@@ -1,4 +1,4 @@
-@core @core_group @_only_local
+@core @core_group @_only_local @_file_upload
 Feature: Importing of groups and groupings
   In order to import groups and grouping
   As a teacher
diff --git a/mod/assign/tests/behat/file_submission.feature b/mod/assign/tests/behat/file_submission.feature
index 7bc5380e88b..07a5dc02974 100644
--- a/mod/assign/tests/behat/file_submission.feature
+++ b/mod/assign/tests/behat/file_submission.feature
@@ -1,4 +1,4 @@
-@mod @mod_assign @_only_local
+@mod @mod_assign @_only_local @_file_upload
 Feature: In an assignment, students can upload files for assessment
   In order to complete my assignments providing files
   As a student
diff --git a/mod/scorm/tests/behat/add_scorm.feature b/mod/scorm/tests/behat/add_scorm.feature
index 055488ef96a..250158f7a67 100644
--- a/mod/scorm/tests/behat/add_scorm.feature
+++ b/mod/scorm/tests/behat/add_scorm.feature
@@ -1,4 +1,4 @@
-@mod @mod_scorm @_only_local
+@mod @mod_scorm @_only_local @_file_upload
 Feature: Add scorm activity
   In order to let students access a scorm package
   As a teacher
diff --git a/repository/recent/tests/behat/add_recent.feature b/repository/recent/tests/behat/add_recent.feature
index 25048265b5d..04679be8ffb 100644
--- a/repository/recent/tests/behat/add_recent.feature
+++ b/repository/recent/tests/behat/add_recent.feature
@@ -1,4 +1,4 @@
-@repository @repository_recent @_only_local
+@repository @repository_recent @_only_local @_file_upload
 Feature: Recent files repository lists the recently used files
   In order to save time when selecting files
   As a user
diff --git a/repository/tests/behat/cancel_add_file.feature b/repository/tests/behat/cancel_add_file.feature
index f995bd8e270..99caf730878 100644
--- a/repository/tests/behat/cancel_add_file.feature
+++ b/repository/tests/behat/cancel_add_file.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_only_local @_file_upload
 Feature: A selected file can be cancelled
   In order to refine the file manager contents
   As a user
diff --git a/repository/tests/behat/delete_files.feature b/repository/tests/behat/delete_files.feature
index c6bb5ff5be6..0d1fdc634ac 100644
--- a/repository/tests/behat/delete_files.feature
+++ b/repository/tests/behat/delete_files.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_only_local @_file_upload
 Feature: Delete files and folders from the file manager
   In order to clean the file manager contents
   As a user
diff --git a/repository/upload/tests/behat/upload_file.feature b/repository/upload/tests/behat/upload_file.feature
index 1e028f7e2a3..217505cde81 100644
--- a/repository/upload/tests/behat/upload_file.feature
+++ b/repository/upload/tests/behat/upload_file.feature
@@ -1,4 +1,4 @@
-@repository @repository_upload @_only_local
+@repository @repository_upload @_only_local @_file_upload
 Feature: Upload files
   In order to add contents
   As a user