diff --git a/test/features/comments.feature b/test/features/comments.feature
index 72991665..d29d1468 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -47,7 +47,7 @@ Feature: Comments
         Then I should see an element with xpath "//h3[contains(string(), 'Add a comment')]"
         When I submit a comment with subject "Testing Data Request comment" and comment "This is a test data request comment"
         And I wait for 5 seconds
-        Then I should receive a base64 email at "dr_admin@localhost" containing both "Data request subject: $last_generated_title" and "Comment: This is a test data request comment"
+        Then I should receive a base64 email at "dr_admin@localhost" containing both "Data request subject: Test Title" and "Comment: This is a test data request comment"
 
     @comment-add @comment-profane
     Scenario: When a logged-in user submits a comment containing profanity on a Dataset they should receive an error message and the comment will not appear
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 9dac85f4..cc6d9653 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -557,7 +557,7 @@ def filter_contents(mail):
         else:
             import base64
             decoded_payload = six.ensure_text(base64.b64decode(six.ensure_binary(payload_bytes)))
-        print('decoded_payload: ', decoded_payload)
+        print('Searching for', text, ' and ', text2, ' in decoded_payload: ', decoded_payload)
         return text in decoded_payload and (not text2 or text2 in decoded_payload)
 
     assert context.mail.user_messages(address, filter_contents)