3 files changed, 4 insertions, 4 deletions
diff --git a/service/test/functional/features/steps/attachments.py b/service/test/functional/features/steps/attachments.py
index 7a80c34f..43948016 100644
--- a/service/test/functional/features/steps/attachments.py
+++ b/service/test/functional/features/steps/attachments.py
@@ -51,7 +51,7 @@ def build_mail_with_attachment(subject):
 
 @wait_for(timeout=10.0)
 def load_mail_into_soledad(context, mail):
-    return context.client.mail_store.add_mail('INBOX', mail.as_string())
+    return context.single_user_client.mail_store.add_mail('INBOX', mail.as_string())
 
 
 @then(u'I see the mail has an attachment')
diff --git a/service/test/functional/features/steps/common.py b/service/test/functional/features/steps/common.py
index bbceb015..c3916313 100644
--- a/service/test/functional/features/steps/common.py
+++ b/service/test/functional/features/steps/common.py
@@ -188,4 +188,4 @@ def get_console_log(context):
 
 def create_email(context):
     input_mail = MailBuilder().build_input_mail()
-    context.client.add_mail_to_inbox(input_mail)
+    context.single_user_client.add_mail_to_inbox(input_mail)
diff --git a/service/test/functional/features/steps/data_setup.py b/service/test/functional/features/steps/data_setup.py
index 167acf9a..3d28baed 100644
--- a/service/test/functional/features/steps/data_setup.py
+++ b/service/test/functional/features/steps/data_setup.py
@@ -26,8 +26,8 @@ def add_mail_impl(context):
 
     input_mail = MailBuilder().with_subject(subject).build_input_mail()
 
-    context.client.add_mail_to_inbox(input_mail)
-    wait_for_condition(context, lambda _: context.client.search_engine.search(subject)[1] > 0, poll_frequency=0.1)
+    context.single_user_client.add_mail_to_inbox(input_mail)
+    wait_for_condition(context, lambda _: context.single_user_client.search_engine.search(subject)[1] > 0, poll_frequency=0.1)
 
     context.last_subject = subject