diff --git a/tests/Behat/Resources/suites.xml b/tests/Behat/Resources/suites.xml
deleted file mode 100644
index f4afe031f..000000000
--- a/tests/Behat/Resources/suites.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <imports>
-        <import resource="suites/ui/managing_blocks.yml"/>
-        <import resource="suites/ui/managing_pages.yml"/>
-        <import resource="suites/ui/managing_frequently_asked_questions.yml"/>
-        <import resource="suites/ui/managing_sections.yml"/>
-        <import resource="suites/ui/managing_media.yml"/>
-        <import resource="suites/ui/shop_blocks.yml"/>
-        <import resource="suites/ui/shop_media.yml"/>
-        <import resource="suites/ui/shop_pages.yml"/>
-        <import resource="suites/ui/shop_frequently_asked_questions.yml"/>
-
-        <import resource="suites/api/shop_pages.yml"/>
-        <import resource="suites/api/shop_frequently_asked_questions.yml"/>
-        <import resource="suites/api/shop_blocks.yml"/>
-        <import resource="suites/api/shop_sections.yml"/>
-        <import resource="suites/api/shop_media.yml"/>
-    </imports>
-</container>
diff --git a/tests/Behat/Resources/suites.yml b/tests/Behat/Resources/suites.yml
new file mode 100644
index 000000000..773c3c0be
--- /dev/null
+++ b/tests/Behat/Resources/suites.yml
@@ -0,0 +1,16 @@
+imports:
+    - suites/ui/managing_blocks.yml
+    - suites/ui/managing_pages.yml
+    - suites/ui/managing_frequently_asked_questions.yml
+    - suites/ui/managing_sections.yml
+    - suites/ui/managing_media.yml
+    - suites/ui/shop_blocks.yml
+    - suites/ui/shop_media.yml
+    - suites/ui/shop_pages.yml
+    - suites/ui/shop_frequently_asked_questions.yml
+
+    - suites/api/shop_pages.yml
+    - suites/api/shop_frequently_asked_questions.yml
+    - suites/api/shop_blocks.yml
+    - suites/api/shop_sections.yml
+    - suites/api/shop_media.yml