diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
index 67605e2dbe551ca03c606f52a38c897b593ebbef..f503dd0844b1fe5e463d76928acef05af08d9701 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
@@ -23,7 +23,6 @@
<group value="login"/>
<env value="chrome"/>
<env value="firefox"/>
- <env value="phantomjs"/>
<env value="headless"/>
</annotations>
<amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
index fde1baac0c4432993ba67a61b085eeeef3860025..112c57fbb86112e73d9ca3c44a1e56ce29c2d056 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
@@ -23,7 +23,6 @@
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-25580"/>
<group value="cms"/>
- <group value="skip"/>
<env value="chrome"/>
<env value="firefox"/>
<env value="headless"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
index 1e1475e154cd3f1e3c25c1ebebb1d3fa94454e33..c68f6ed83bc781fde818d244480d1a6351ead8dd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
@@ -25,13 +25,10 @@
<description value="You should be able to create a Configurable Product via the Admin."/>
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-26041"/>
- <group value="configurable"/>
- <group value="product"/>
- <env value="chrome"/>
+ <group value="skip"/>
</annotations>
-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryGridPage"/>
- <waitForPageLoad stepKey="waitForPageLoad1"/>
+ <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="enterCategoryName"/>
@@ -41,7 +38,7 @@
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
- <waitForPageLoad stepKey="waitForPageLoad2"/>
+ <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
<click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
<fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
@@ -110,15 +107,15 @@
<see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
<amOnPage url="/" stepKey="amOnStorefront"/>
- <waitForPageLoad stepKey="waitForPageLoad3"/>
+ <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
<click userInput="{{_defaultCategory.name}}" stepKey="clickOnCategoryName"/>
- <waitForPageLoad stepKey="waitForPageLoad4"/>
+ <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
<see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
<see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
<click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
- <waitForPageLoad stepKey="waitForPageLoad5"/>
+ <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
<seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
<see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
index 6c79e31478c9ac8df69242801e2acdc2a7e31396..2ed55e691a038bc776d3c73f827360bdb463bd3c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
@@ -28,7 +28,6 @@
<group value="customer"/>
<env value="chrome"/>
<env value="firefox"/>
- <env value="phantomjs"/>
<env value="headless"/>
</annotations>
<amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
index 0f13decf74090fa8b927b9d36f003ee8c51bc7c0..7daef0fc1ed417d5aa60caeb203472b6058ae017 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
@@ -12,6 +12,7 @@
<annotations>
<features value="Create a Configurable Product By API"/>
<stories value="Create a Configurable Product By API"/>
+ <group value="skip"/>
</annotations>
<before>
<createData stepKey="categoryHandle" entity="SimpleSubCategory" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
index b202095bea1e49ea27e830d134ad5a7227a000f6..68d7f75a964d2567e32f3deb0865a6d17a35ac9d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
@@ -12,6 +12,7 @@
<annotations>
<features value="Create a Sales Rule By API"/>
<stories value="Create a Sales Rule By API"/>
+ <group value="skip"/>
</annotations>
<before>
<createData stepKey="saleRule" entity="SimpleSalesRule" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
index c571e8694beead5249a819ee961c44a85d0f6880..350c228bc50717934f62830c6ad8db77fc293e45 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
@@ -23,7 +23,6 @@
<group value="example"/>
<env value="chrome"/>
<env value="firefox"/>
- <env value="phantomjs"/>
<env value="headless"/>
</annotations>
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
index 005031284b532d82a97f98006d4b396d7416728d..9022ae32a337c30915f60a3ef81f3d8ecd79d001 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
@@ -9,6 +9,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<cest name="SetPaymentConfigurationCest">
+ <annotations>
+ <group value="skip"/>
+ </annotations>
<test name="SetPaypalConfigurationTest">
<createData entity="SamplePaypalConfig" stepKey="createSamplePaypalConfig"/>
<createData entity="DefaultPayPalConfig" stepKey="restoreDefaultPaypalConfig"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
index 48e87294411f180f81a57d7bd9f18a946bea0b7f..9fa215e582e3ae80059db3fda4736f44690b2afb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
@@ -11,11 +11,7 @@
<annotations>
<features value="Update simple product by api test."/>
<stories value="Update simple product by api test."/>
- <group value="example"/>
- <env value="chrome"/>
- <env value="firefox"/>
- <env value="phantomjs"/>
- <env value="headless"/>
+ <group value="skip"/>
</annotations>
<before>
<createData stepKey="categoryHandle" entity="SimpleSubCategory"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
index ef04dfd795a86ea63d6a6b6b0a4455fccdfc91f1..8cfcd7d29ec14781e3c526ac989c3daa406a5fdc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
@@ -13,7 +13,6 @@
<stories value="Create a store group in admin"/>
<env value="chrome"/>
<env value="firefox"/>
- <env value="phantomjs"/>
<group value="store"/>
</annotations>
<before>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
index 80aa26e20a99990aff4c3a9cc723de6a5a870f52..9b21337f94dd9365d2bfa5342f831a1c80e597c9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
@@ -13,7 +13,6 @@
<stories value="Delete a persist wishlist for a customer"/>
<env value="chrome"/>
<env value="firefox"/>
- <env value="phantomjs"/>
<group value="wishlist"/>
</annotations>
<before>