2 files changed, 5 insertions, 5 deletions
diff --git a/service/test/functional/features/steps/attachments.py b/service/test/functional/features/steps/attachments.py
index 76e42177..8fa032df 100644
--- a/service/test/functional/features/steps/attachments.py
+++ b/service/test/functional/features/steps/attachments.py
@@ -51,7 +51,7 @@ def load_mail_into_soledad(context, mail):
 
 @then(u'I see the mail has an attachment')
 def step_impl(context):
-    attachments_list = find_elements_by_css_selector(context, '.attachmentsArea li')
+    attachments_list = find_elements_by_css_selector(context, '.mail-read-view__attachments-item')
     assert len(attachments_list) == 1
 
 
diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py
index c0e9e22b..565031b5 100644
--- a/service/test/functional/features/steps/mail_view.py
+++ b/service/test/functional/features/steps/mail_view.py
@@ -19,7 +19,7 @@ from common import *
 
 @then('I see that the subject reads \'{subject}\'')
 def impl(context, subject):
-    e = find_element_by_css_selector(context, '#mail-view .subject')
+    e = find_element_by_css_selector(context, '#mail-view .mail-read-view__header-subject')
     assert e.text == subject
 
 
@@ -100,13 +100,13 @@ def impl(context):
 @when('I choose to trash')
 def impl(context):
     context.browser.execute_script("$('button#view-more-actions').click()")
-    click_button(context, 'Delete this message', 'span')
+    click_button(context, 'Delete this message', 'li')
 
 
 @then('I see the mail has a cc and a bcc recipient')
 def impl(context):
-    cc = find_element_by_css_selector(context, '.msg-header .cc')
-    bcc = find_element_by_css_selector(context, '.msg-header .bcc')
+    cc = find_element_by_css_selector(context, '.mail-read-view__header-recipients .cc')
+    bcc = find_element_by_css_selector(context, '.mail-read-view__header-recipients .bcc')
 
     assert cc is not None
     assert bcc is not None