diff --git a/test/appium/support/api/network_api.py b/test/appium/support/api/network_api.py
index 7c54756101..6424484335 100644
--- a/test/appium/support/api/network_api.py
+++ b/test/appium/support/api/network_api.py
@@ -11,7 +11,7 @@ class NetworkApi(object):
 
     def __init__(self):
         self.network_url = 'http://api-%s.etherscan.io/api?' % pytest.config.getoption('network')
-        self.faucet_url = 'http://51.15.45.169:3001/donate'
+        self.faucet_url = 'https://faucet-ropsten.status.im/donate'
         self.chat_bot_url = 'http://offsite.chat:8099'
 
     def get_transactions(self, address: str) -> List[dict]:
diff --git a/test/appium/views/profile_view.py b/test/appium/views/profile_view.py
index d084eaa09f..dab29b6eb7 100644
--- a/test/appium/views/profile_view.py
+++ b/test/appium/views/profile_view.py
@@ -331,18 +331,12 @@ class AddBootnodeButton(BaseButton):
         self.locator = self.Locator.xpath_selector("(//*[@content-desc='icon'])[2]")
 
 
-class BootnodeNameInput(BaseEditBox):
-
-    def __init__(self, driver):
-        super(BootnodeNameInput, self).__init__(driver)
-        self.locator = self.Locator.xpath_selector("//android.widget.EditText[@text='Specify a name']")
-
-
 class BootnodeAddressInput(BaseEditBox):
 
     def __init__(self, driver):
         super(BootnodeAddressInput, self).__init__(driver)
-        self.locator = self.Locator.xpath_selector("//android.widget.EditText[@text='Specify bootnode address']")
+        self.locator = self.Locator.xpath_selector(
+            "//*[@text='Bootnode address']/following-sibling::*[1]/android.widget.EditText")
 
 
 class EnableBootnodesToggle(BaseEditBox):
@@ -363,7 +357,8 @@ class MailServerAddressInput(BaseEditBox):
 
     def __init__(self, driver):
         super(MailServerAddressInput, self).__init__(driver)
-        self.locator = self.Locator.xpath_selector("//android.widget.EditText[@text='Specify a mailserver address']")
+        self.locator = self.Locator.xpath_selector(
+            "//*[@text='Mailserver address']/following-sibling::*[1]/android.widget.EditText")
 
 
 class MailServerAutoSelectionButton(BaseButton):