diff --git a/functional_tests/step_definitions/application.py b/functional_tests/step_definitions/application.py
index 7085e1f92..91cb1d2a8 100644
--- a/functional_tests/step_definitions/application.py
+++ b/functional_tests/step_definitions/application.py
@@ -98,7 +98,7 @@ def disable_avahi(browser):
 
 
 @given(
-    parsers.parse('the domain name for {app_name:w} is set to {domain_name:w}')
+    parsers.parse('the domain name for {app_name:w} is set to {domain_name:S}')
 )
 def select_domain_name(browser, app_name, domain_name):
     application.select_domain_name(browser, app_name, domain_name)
diff --git a/functional_tests/step_definitions/system.py b/functional_tests/step_definitions/system.py
index def6eb2fb..ddca29d27 100644
--- a/functional_tests/step_definitions/system.py
+++ b/functional_tests/step_definitions/system.py
@@ -51,7 +51,7 @@ def change_hostname_to(browser, hostname):
     system.set_hostname(browser, hostname)
 
 
-@when(parsers.parse('I change the domain name to {domain:w}'))
+@when(parsers.parse('I change the domain name to {domain:S}'))
 def change_domain_name_to(browser, domain):
     system.set_domain_name(browser, domain)
 
@@ -71,7 +71,7 @@ def hostname_should_be(browser, hostname):
     assert system.get_hostname(browser) == hostname
 
 
-@then(parsers.parse('the domain name should be {domain:w}'))
+@then(parsers.parse('the domain name should be {domain:S}'))
 def domain_name_should_be(browser, domain):
     assert system.get_domain_name(browser) == domain