diff --git a/.drone.star b/.drone.star
index dcf05705a..0d14257a4 100644
--- a/.drone.star
+++ b/.drone.star
@@ -151,9 +151,9 @@ config = {
                 "OCIS_ADD_RUN_SERVICES": "antivirus",
             },
         },
-        "apiFullTextSearch": {
+        "apiSearch": {
             "suites": [
-                "apiFullTextSearch",
+                "apiSearch",
             ],
             "skip": False,
             "tikaNeeded": True,
diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
index 2b11684eb..6bb5665f7 100644
--- a/tests/acceptance/config/behat.yml
+++ b/tests/acceptance/config/behat.yml
@@ -41,7 +41,6 @@ default:
         - NotificationContext:
         - OCSContext:
         - PublicWebDavContext:
-        - SearchContext:
         - TagContext:
         - TUSContext:
         - SpacesTUSContext:
@@ -62,7 +61,6 @@ default:
         - FilesVersionsContext:
         - OCSContext:
         - PublicWebDavContext:
-        - SearchContext:
         - TrashbinContext:
         - WebDavPropertiesContext:
         - TUSContext:
@@ -115,11 +113,9 @@ default:
         - FilesVersionsContext:
         - OCSContext:
         - PublicWebDavContext:
-        - SearchContext:
         - TUSContext:
         - SpacesTUSContext:
         - OcisConfigContext:
-        - TagContext:
         - TrashbinContext:
 
     apiCors:
@@ -195,9 +191,9 @@ default:
         - PublicWebDavContext:
         - ArchiverContext:
 
-    apiFullTextSearch:
+    apiSearch:
       paths:
-        - '%paths.base%/../features/apiFullTextSearch'
+        - '%paths.base%/../features/apiSearch'
       context: *common_ldap_suite_context
       contexts:
         - SettingsContext:
@@ -210,6 +206,7 @@ default:
         - FilesVersionsContext:
         - OCSContext:
         - TrashbinContext:
+        - TagContext:
 
     apiReshare:
       paths:
diff --git a/tests/acceptance/features/apiSpaces/search.feature b/tests/acceptance/features/apiSearch/apiSpaceSearch.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/search.feature
rename to tests/acceptance/features/apiSearch/apiSpaceSearch.feature
diff --git a/tests/acceptance/features/apiFullTextSearch/search.feature b/tests/acceptance/features/apiSearch/contentSearch.feature
similarity index 99%
rename from tests/acceptance/features/apiFullTextSearch/search.feature
rename to tests/acceptance/features/apiSearch/contentSearch.feature
index e1eb6a02e..7be1880d2 100644
--- a/tests/acceptance/features/apiFullTextSearch/search.feature
+++ b/tests/acceptance/features/apiSearch/contentSearch.feature
@@ -1,6 +1,6 @@
-Feature: full text search
+Feature: content search
   As a user
-  I want to do full text search
+  I want to do search resources by content
   So that I can find the files with the content I am looking for
 
   Background:
diff --git a/tests/acceptance/features/apiGraph/fullSearch.feature b/tests/acceptance/features/apiSearch/tagSearch.feature
similarity index 99%
rename from tests/acceptance/features/apiGraph/fullSearch.feature
rename to tests/acceptance/features/apiSearch/tagSearch.feature
index 4ea9cc8b9..140d9b264 100644
--- a/tests/acceptance/features/apiGraph/fullSearch.feature
+++ b/tests/acceptance/features/apiSearch/tagSearch.feature
@@ -1,7 +1,7 @@
-Feature: full text search
+Feature: tag search
   As a user
-  I want to do full text search
-  So that I can find the files with the content I am looking for
+  I want to do search resources by tag
+  So that I can find the files with the tag I am looking for
 
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files