diff --git a/tests/features/zanshin/features/tags/tag-add.feature b/tests/features/renku/features/tags/tag-add.feature
rename from tests/features/zanshin/features/tags/tag-add.feature
rename to tests/features/renku/features/tags/tag-add.feature
--- a/tests/features/zanshin/features/tags/tag-add.feature
+++ b/tests/features/renku/features/tags/tag-add.feature
@@ -1,5 +1,5 @@
 Feature: Tag creation
-  As someone using tasks and notes
+  As someone using notes
   I can create a tag
   In order to give them some semantic
 
@@ -11,15 +11,6 @@
     Then the list is:
        | display                           | icon                |
        | Inbox                             | mail-folder-inbox   |
-       | Workday                           | go-jump-today       |
-       | Projects                          | folder              |
-       | Projects / Backlog                | view-pim-tasks      |
-       | Projects / Party                  | view-pim-tasks      |
-       | Projects / Read List              | view-pim-tasks      |
-       | Contexts                          | folder              |
-       | Contexts / Chores                 | view-pim-tasks      |
-       | Contexts / Internet               | view-pim-tasks      |
-       | Contexts / Online                 | view-pim-tasks      |
        | Tags                              | folder              |
        | Tags / Optional                   | view-pim-tasks      |
        | Tags / Philosophy                 | view-pim-tasks      |
diff --git a/tests/features/renku/features/tags/tag-remove.feature b/tests/features/renku/features/tags/tag-remove.feature
new file mode 100644
--- /dev/null
+++ b/tests/features/renku/features/tags/tag-remove.feature
@@ -0,0 +1,15 @@
+Feature: Tag removal
+  As someone using notes
+  I can remove a tag
+  In order to maintain their semantic
+
+  Scenario: Removed tag disappear from the list
+    Given I display the available pages
+    When I remove a "tag" named "Optional"
+    And I list the items
+    Then the list is:
+       | display                           | icon                |
+       | Inbox                             | mail-folder-inbox   |
+       | Tags                              | folder              |
+       | Tags / Philosophy                 | view-pim-tasks      |
+       | Tags / Physics                    | view-pim-tasks      |
diff --git a/tests/features/zanshin/features/tags/tag-remove.feature b/tests/features/zanshin/features/tags/tag-remove.feature
deleted file mode 100644
--- a/tests/features/zanshin/features/tags/tag-remove.feature
+++ /dev/null
@@ -1,24 +0,0 @@
-Feature: Tag removal
-  As someone using tasks and notes
-  I can remove a tag
-  In order to maintain their semantic
-
-  Scenario: Removed tag disappear from the list
-    Given I display the available pages
-    When I remove a "tag" named "Optional"
-    And I list the items
-    Then the list is:
-       | display                           | icon                |
-       | Inbox                             | mail-folder-inbox   |
-       | Workday                           | go-jump-today       |
-       | Projects                          | folder              |
-       | Projects / Backlog                | view-pim-tasks      |
-       | Projects / Party                  | view-pim-tasks      |
-       | Projects / Read List              | view-pim-tasks      |
-       | Contexts                          | folder              |
-       | Contexts / Chores                 | view-pim-tasks      |
-       | Contexts / Internet               | view-pim-tasks      |
-       | Contexts / Online                 | view-pim-tasks      |
-       | Tags                              | folder              |
-       | Tags / Philosophy                 | view-pim-tasks      |
-       | Tags / Physics                    | view-pim-tasks      |