diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt
index e9dc67f41f1..ea5034721f9 100644
--- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt
+++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt
@@ -7,6 +7,7 @@ class SiteAddressScreen : Screen {
     constructor() : super(org.wordpress.android.login.R.id.input)
 
     fun proceedWith(siteAddress: String): EmailAddressScreen {
+        clickOn(org.wordpress.android.login.R.id.input)
         typeTextInto(org.wordpress.android.login.R.id.input, siteAddress)
         clickOn(R.id.bottom_button)
 
diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt
index 8f11432d1f6..6efb13fb8eb 100644
--- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt
+++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt
@@ -121,9 +121,9 @@ class ProductListScreen : Screen {
                     Matchers.allOf(
                         ViewMatchers.withId(R.id.productStockAndStatus),
                         ViewMatchers.withText(
-                            "${product.stockStatus}${product.variations} • \$${product.priceDiscountedRaw}.00"
-
-                        )
+                            Matchers.containsString("${product.stockStatus}${product.variations} • ")
+                        ),
+                        ViewMatchers.withText(Matchers.containsString(product.priceDiscountedRaw))
                     )
                 ),
                 ViewMatchers.withChild(