diff --git a/etc/behat/suites/ui/channel.yml b/etc/behat/suites/ui/channel/products_accessibility_in_multiple_channels.yml
similarity index 83%
rename from etc/behat/suites/ui/channel.yml
rename to etc/behat/suites/ui/channel/products_accessibility_in_multiple_channels.yml
index d621535cb9..2d3907fc1a 100644
--- a/etc/behat/suites/ui/channel.yml
+++ b/etc/behat/suites/ui/channel/products_accessibility_in_multiple_channels.yml
@@ -3,7 +3,7 @@
 
 default:
     suites:
-        ui_channel:
+        ui_products_accessibility_in_multiple_channels:
             contexts_as_services:
                 - sylius.behat.context.hook.doctrine_orm
 
@@ -19,4 +19,4 @@ default:
                 - sylius.behat.context.ui.product
 
             filters:
-                tags: "@channel && @ui"
+                tags: "@products_accessibility_in_multiple_channels && @ui"
diff --git a/etc/behat/suites/ui/channel/theming.yml b/etc/behat/suites/ui/channel/theming.yml
new file mode 100644
index 0000000000..0c57323c51
--- /dev/null
+++ b/etc/behat/suites/ui/channel/theming.yml
@@ -0,0 +1,22 @@
+# This file is part of the Sylius package.
+# (c) Paweł Jędrzejewski
+
+default:
+    suites:
+        ui_theming:
+            contexts_as_services:
+                - sylius.behat.context.hook.doctrine_orm
+
+                - sylius.behat.context.transform.shared_storage
+                - sylius.behat.context.transform.channel
+                - sylius.behat.context.transform.theme
+
+                - sylius.behat.context.setup.channel
+                - sylius.behat.context.setup.security
+                - sylius.behat.context.setup.theme
+
+                - sylius.behat.context.ui.channel
+                - sylius.behat.context.ui.theme
+
+            filters:
+                tags: "@theming && @ui"
diff --git a/features/channel/fake_multi_channel_support.feature b/features/channel/products_accessibility_in_multiple_channels/products_accessibility_in_multiple_channels.feature
similarity index 91%
rename from features/channel/fake_multi_channel_support.feature
rename to features/channel/products_accessibility_in_multiple_channels/products_accessibility_in_multiple_channels.feature
index 109674162c..8b022e63cd 100644
--- a/features/channel/fake_multi_channel_support.feature
+++ b/features/channel/products_accessibility_in_multiple_channels/products_accessibility_in_multiple_channels.feature
@@ -1,5 +1,5 @@
-@channel
-Feature: Fake multi-channel support
+@products_accessibility_in_multiple_channels
+Feature: Multi-channel support
     In order to see how my store looks on a different channels
     As a Developer
     I want to change between channels with ease
diff --git a/features/channel/displaying_themed_channel_website.feature b/features/channel/theming/displaying_themed_channel_website.feature
similarity index 96%
rename from features/channel/displaying_themed_channel_website.feature
rename to features/channel/theming/displaying_themed_channel_website.feature
index 2f7822a2ee..f8c77494f0 100644
--- a/features/channel/displaying_themed_channel_website.feature
+++ b/features/channel/theming/displaying_themed_channel_website.feature
@@ -1,4 +1,4 @@
-@theme @ui
+@theming
 Feature: Displaying themed channel website
     In order to easily distinguish stores
     As an Visitor
@@ -9,11 +9,13 @@ Feature: Displaying themed channel website
         And the store has "Maverick Meerkat" theme
         And this theme changes homepage template contents to "Onions and bananas"
 
+    @ui
     Scenario: Displaying default shop homepage
         Given channel "France" does not use any theme
         When I visit this channel's homepage
         Then I should not see a homepage from "Maverick Meerkat" theme
 
+    @ui
     Scenario: Displaying themed shop homepage
         Given channel "France" uses "Maverick Meerkat" theme
         When I visit this channel's homepage
diff --git a/features/channel/managing_themes_per_channel.feature b/features/channel/theming/managing_themes_per_channel.feature
similarity index 98%
rename from features/channel/managing_themes_per_channel.feature
rename to features/channel/theming/managing_themes_per_channel.feature
index af746cb33d..c4b606ba72 100644
--- a/features/channel/managing_themes_per_channel.feature
+++ b/features/channel/theming/managing_themes_per_channel.feature
@@ -1,4 +1,4 @@
-@theme
+@theming
 Feature: Managing themes per channel
     In order to allow customizing channels' appearance
     As a store owner