diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertStorefrontContactUsInvalidEmailActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertStorefrontContactUsInvalidEmailActionGroup.xml
new file mode 100644
index 0000000000000..8dd303c031699
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertStorefrontContactUsInvalidEmailActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
index 0970f1f8f6b20..016a96db828fe 100644
--- a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
@@ -9,6 +9,7 @@
diff --git a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormFailedTest.xml b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormFailedTest.xml
new file mode 100644
index 0000000000000..fbeebebf82740
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormFailedTest.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormSuccessTest.xml b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormSuccessTest.xml
new file mode 100644
index 0000000000000..289a39f8d36fb
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontSubmitContactUsFormSuccessTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 94083aada09e2..4d02bde652147 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -438,6 +438,20 @@
US_Address_CA
US_Address_NY_Not_Default_Address
+
+ 1
+ true
+ true
+ John.Doe@
+ John
+ Doe
+ John Doe
+ pwdTest123!
+ 0
+ 0
+ General
+ US_Address_TX
+
United Kingdom
UK_With_State_Default_Billing