diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
index 66621f23d..e19d6f65d 100644
--- a/test/models/domain/force_delete_test.rb
+++ b/test/models/domain/force_delete_test.rb
@@ -517,6 +517,29 @@ class ForceDeleteTest < ActionMailer::TestCase
     assert_not @domain.force_delete_scheduled?
   end
 
+  def test_lifts_force_delete_after_changing_to_valid_email
+    @domain.update(valid_to: Time.zone.parse('2012-08-05'))
+    assert_not @domain.force_delete_scheduled?
+    travel_to Time.zone.parse('2010-07-05')
+    @domain.registrant.update_attribute(:email, '`@internet.ee')
+    3.times { @domain.registrant.verify_email }
+    perform_check_force_delete_job(@domain.registrant.id)
+    @domain.reload
+
+    assert @domain.force_delete_scheduled?
+
+    @domain.registrant.update(email: 'aaa@bbb.ee')
+    @domain.registrant.verify_email
+    @domain.reload
+
+    assert @domain.registrant.need_to_lift_force_delete?
+
+    perform_enqueued_jobs { CheckForceDeleteLift.perform_now }
+    @domain.reload
+
+    assert_not @domain.force_delete_scheduled?
+  end
+
   def prepare_bounced_email_address(email)
     @bounced_mail = BouncedMailAddress.new
     @bounced_mail.email = email