diff --git a/.travis.yml b/.travis.yml
index 42c2bcab0c901..9adce44fe6734 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,7 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
-    - TEST_SUITE=functional ACCEPTANCE_INDEX=1
-    - TEST_SUITE=functional ACCEPTANCE_INDEX=2
+    - TEST_SUITE=functional
 matrix:
   exclude:
     - php: 7.0
@@ -40,9 +39,7 @@ matrix:
     - php: 7.0
       env: TEST_SUITE=js GRUNT_COMMAND=static
     - php: 7.0
-      env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
-    - php: 7.0
-      env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
+      env: TEST_SUITE=functional
 cache:
   apt: true
   directories:
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance.xml
new file mode 100644
index 0000000000000..3eec40244c7ec
--- /dev/null
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testcase">
+        <allow>
+            <tag group="test_type" value="acceptance_test" />
+        </allow>
+        <deny>
+            <tag group="stable" value="no" />
+        </deny>
+    </rule>
+    <rule scope="variation">
+        <allow>
+            <tag group="test_type" value="acceptance_test" />
+            <tag group="severity" value="S0, S1" />
+        </allow>
+        <deny>
+            <tag group="stable" value="no" />
+        </deny>
+    </rule>
+</config>
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
deleted file mode 100644
index 716a6dd89a61f..0000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
-    <rule scope="testsuite">
-        <allow>
-            <module value="Magento_AdminNotification" strict="1" />
-            <module value="Magento_AdvancedPricingImportExport" strict="1" />
-            <module value="Magento_Authorizenet" strict="1" />
-            <module value="Magento_Backend" strict="1" />
-            <module value="Magento_Backup" strict="1" />
-            <module value="Magento_Braintree" strict="1" />
-            <module value="Magento_Bundle" strict="1" />
-            <module value="Magento_BundleImportExport" strict="1" />
-            <module value="Magento_Captcha" strict="1" />
-            <module value="Magento_Catalog" strict="1" />
-            <module value="Magento_CatalogImportExport" strict="1" />
-            <module value="Magento_CatalogInventory" strict="1" />
-            <module value="Magento_CatalogInventoryConfigurableProduct" strict="1" />
-            <module value="Magento_CatalogRule" strict="1" />
-            <module value="Magento_CatalogRuleConfigurable" strict="1" />
-            <module value="Magento_CatalogSearch" strict="1" />
-            <module value="Magento_CatalogUrlRewrite" strict="1" />
-            <module value="Magento_CheckoutAgreements" strict="1" />
-            <module value="Magento_Cms" strict="1" />
-            <module value="Magento_Config" strict="1" />
-            <module value="Magento_ConfigurableImportExport" strict="1" />
-            <module value="Magento_Contact" strict="1" />
-            <module value="Magento_CurrencySymbol" strict="1" />
-            <module value="Magento_Customer" strict="1" />
-            <module value="Magento_CustomerImportExport" strict="1" />
-            <module value="Magento_Dhl" strict="1" />
-            <module value="Magento_Directory" strict="1" />
-            <module value="Magento_Downloadable" strict="1" />
-            <module value="Magento_Email" strict="1" />
-            <module value="Magento_Fedex" strict="1" />
-            <module value="Magento_GiftMessage" strict="1" />
-            <module value="Magento_GroupedImportExport" strict="1" />
-            <module value="Magento_GroupedProduct" strict="1" />
-            <module value="Magento_ImportExport" strict="1" />
-            <module value="Magento_Indexer" strict="1" />
-            <module value="Magento_Install" strict="1" />
-            <module value="Magento_Integration" strict="1" />
-        </allow>
-    </rule>
-    <rule scope="testcase">
-        <allow>
-            <tag group="test_type" value="acceptance_test" />
-        </allow>
-        <deny>
-            <tag group="stable" value="no" />
-        </deny>
-    </rule>
-    <rule scope="variation">
-        <allow>
-            <tag group="test_type" value="acceptance_test" />
-        </allow>
-        <deny>
-            <tag group="stable" value="no" />
-        </deny>
-    </rule>
-</config>
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
deleted file mode 100644
index ce3f79f2923d9..0000000000000
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
-    <rule scope="testsuite">
-        <allow>
-            <module value="Magento_ConfigurableProduct" strict="1" />
-            <module value="Magento_Checkout" strict="1" />
-            <module value="Magento_LayeredNavigation" strict="1" />
-            <module value="Magento_Msrp" strict="1" />
-            <module value="Magento_Multishipping" strict="1" />
-            <module value="Magento_Newsletter" strict="1" />
-            <module value="Magento_OfflinePayments" strict="1" />
-            <module value="Magento_OfflineShipping" strict="1" />
-            <module value="Magento_PageCache" strict="1" />
-            <module value="Magento_Payment" strict="1" />
-            <module value="Magento_Paypal" strict="1" />
-            <module value="Magento_Persistent" strict="1" />
-            <module value="Magento_ProductVideo" strict="1" />
-            <module value="Magento_Reports" strict="1" />
-            <module value="Magento_Review" strict="1" />
-            <module value="Magento_Sales" strict="1" />
-            <module value="Magento_SalesRule" strict="1" />
-            <module value="Magento_Search" strict="1" />
-            <module value="Magento_Security" strict="1" />
-            <module value="Magento_Setup" strict="1" />
-            <module value="Magento_Shipping" strict="1" />
-            <module value="Magento_Sitemap" strict="1" />
-            <module value="Magento_Store" strict="1" />
-            <module value="Magento_Swagger" strict="1" />
-            <module value="Magento_Swatches" strict="1" />
-            <module value="Magento_Tax" strict="1" />
-            <module value="Magento_Theme" strict="1" />
-            <module value="Magento_Ui" strict="1" />
-            <module value="Magento_Ups" strict="1" />
-            <module value="Magento_UrlRewrite" strict="1" />
-            <module value="Magento_User" strict="1" />
-            <module value="Magento_Usps" strict="1" />
-            <module value="Magento_Variable" strict="1" />
-            <module value="Magento_Vault" strict="1" />
-            <module value="Magento_Weee" strict="1" />
-            <module value="Magento_Widget" strict="1" />
-            <module value="Magento_Wishlist" strict="1" />
-        </allow>
-    </rule>
-    <rule scope="testcase">
-        <allow>
-            <tag group="test_type" value="acceptance_test" />
-        </allow>
-        <deny>
-            <tag group="stable" value="no" />
-        </deny>
-    </rule>
-    <rule scope="variation">
-        <allow>
-            <tag group="test_type" value="acceptance_test" />
-        </allow>
-        <deny>
-            <tag group="stable" value="no" />
-        </deny>
-    </rule>
-</config>
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
index e72e01dfaccd3..0e8cc26e154df 100755
--- a/dev/travis/before_script.sh
+++ b/dev/travis/before_script.sh
@@ -126,7 +126,7 @@ case $TEST_SUITE in
 
         cp ./phpunit.xml.dist ./phpunit.xml
         sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
-        sed -e "s?basic?travis_acceptance_${ACCEPTANCE_INDEX}?g" --in-place ./phpunit.xml
+        sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
         cp ./.htaccess.sample ./.htaccess
         cd ./utils
         php -f mtf troubleshooting:check-all