diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
index fd4f326f6b8d5..91f93e02dc651 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
@@ -223,21 +223,16 @@ public function execute()
             $configData = $this->filterNodes($configData);
 
             $groups = $this->getRequest()->getParam('groups');
-            $europeanUnionCountriesSelectedValues = true;
+
             if (isset($groups['country']['fields'])) {
                 if (isset($groups['country']['fields']['eu_countries'])) {
                     $countries = $groups['country']['fields']['eu_countries'];
                     if (empty($countries['value']) &&
                         !isset($countries['inherit'])) {
-                        $europeanUnionCountriesSelectedValues = false;
+                        throw new LocalizedException(
+                            __('Something went wrong while saving this configuration.')
+                        );
                     }
-                } else {
-                    $europeanUnionCountriesSelectedValues = false;
-                }
-                if (!$europeanUnionCountriesSelectedValues) {
-                    throw new LocalizedException(
-                        __('Something went wrong while saving this configuration.')
-                    );
                 }
             }
 
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 987e199803594..f65f626f1a520 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -59,6 +59,6 @@
         </actionGroup>
         <reloadPage stepKey="realoadPageAfterConfigChanged"/>
         <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeUnitedStatesCountry"/>
-        <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="seeBrazilCountry1"/>
+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="seeBrazilCountry"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillBillingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillBillingAddressActionGroup.xml
index d97642e789a8a..b66c19610f574 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillBillingAddressActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillBillingAddressActionGroup.xml
@@ -15,9 +15,9 @@
         <fillField selector="{{CheckoutPaymentSection.guestFirstName}}" userInput="{{address.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutPaymentSection.guestLastName}}" userInput="{{address.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutPaymentSection.guestStreet}}" userInput="{{address.street[0]}}" stepKey="enterStreet"/>
-        <selectOption selector="{{CheckoutPaymentSection.guestCountry}}" userInput="{{address.country_id}}" stepKey="enterCountrys"/>
         <fillField selector="{{CheckoutPaymentSection.guestCity}}" userInput="{{address.city}}" stepKey="enterCity"/>
         <fillField selector="{{CheckoutPaymentSection.guestPostcode}}" userInput="{{address.postcode}}" stepKey="enterPostcode"/>
+        <selectOption selector="{{CheckoutPaymentSection.guestCountry}}" userInput="{{address.country_id}}" stepKey="enterCountry"/>
         <fillField selector="{{CheckoutPaymentSection.guestTelephone}}" userInput="{{address.telephone}}" stepKey="enterTelephone"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
     </actionGroup>