diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb
index 94c70df4f..a9569e9b2 100644
--- a/spec/features/emails_spec.rb
+++ b/spec/features/emails_spec.rb
@@ -201,8 +201,9 @@ feature 'Emails' do
       notification2 = create_proposal_notification(proposal2)
       notification3 = create_proposal_notification(proposal3)
 
-      email_digest = EmailDigest.new
-      email_digest.create
+      email_digest = EmailDigest.new(user)
+      email_digest.deliver
+      email_digest.mark_as_emailed
 
       email = open_last_email
       expect(email).to have_subject("Proposal notifications in Consul")
@@ -227,9 +228,11 @@ feature 'Emails' do
 
       expect(email).to_not have_body_text(proposal3.title)
       expect(email).to have_body_text(/#{account_path}/)
-    end
 
-    xscenario "Delete all Notifications included in the digest after email sent" do
+      notification1.reload
+      notification2.reload
+      expect(notification1.emailed_at).to be
+      expect(notification2.emailed_at).to be
     end
 
   end
diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb
index d03ea91fd..ae2122793 100644
--- a/spec/lib/email_digests_spec.rb
+++ b/spec/lib/email_digests_spec.rb
@@ -73,6 +73,7 @@ describe EmailDigest do
       proposal_notification = create(:proposal_notification)
       notification = create(:notification, notifiable: proposal_notification, user: user)
 
+      reset_mailer
       email_digest = EmailDigest.new(user)
       email_digest.deliver
 
@@ -86,6 +87,7 @@ describe EmailDigest do
       proposal_notification = create(:proposal_notification)
       notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
 
+      reset_mailer
       email_digest = EmailDigest.new(user)
       email_digest.deliver
 
@@ -97,22 +99,27 @@ describe EmailDigest do
   describe "mark_as_emailed" do
 
     it "marks notifications as emailed" do
-      user = create(:user)
+      user1 = create(:user)
+      user2 = create(:user)
 
       proposal_notification = create(:proposal_notification)
-      notification1 = create(:notification, notifiable: proposal_notification, user: user)
-      notification2 = create(:notification, notifiable: proposal_notification, user: user)
+      notification1 = create(:notification, notifiable: proposal_notification, user: user1)
+      notification2 = create(:notification, notifiable: proposal_notification, user: user1)
+      notification3 = create(:notification, notifiable: proposal_notification, user: user2)
 
       expect(notification1.emailed_at).to_not be
       expect(notification2.emailed_at).to_not be
+      expect(notification3.emailed_at).to_not be
 
-      email_digest = EmailDigest.new(user)
+      email_digest = EmailDigest.new(user1)
       email_digest.mark_as_emailed
 
       notification1.reload
       notification2.reload
+      notification3.reload
       expect(notification1.emailed_at).to be
       expect(notification2.emailed_at).to be
+      expect(notification3.emailed_at).to_not be
     end
 
   end