diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
index 2a4f0704f..8640277c8 100644
--- a/app/models/concerns/domain/deletable.rb
+++ b/app/models/concerns/domain/deletable.rb
@@ -15,10 +15,11 @@ module Concerns::Domain::Deletable
   end
 
   def deletion_time_span
-    Time.zone.now.to_i..deletion_deadline.to_i
+    range_params = [Time.zone.now.to_i, deletion_deadline.to_i].sort
+    Range.new(*range_params)
   end
 
   def deletion_deadline
     delete_at + 24.hours
   end
-end
+end
\ No newline at end of file
diff --git a/test/models/domain/discardable_test.rb b/test/models/domain/discardable_test.rb
index 8c65d18a9..dad23b17b 100644
--- a/test/models/domain/discardable_test.rb
+++ b/test/models/domain/discardable_test.rb
@@ -20,7 +20,7 @@ class DomainDiscardableTest < ActiveSupport::TestCase
   def test_discarding_a_domain_schedules_deletion_at_random_time
     @domain.discard
     other_domain = domains(:airport)
-    other_domain.delete_at = Time.zone.parse('2010-07-05 10:00')
+    other_domain.delete_at = Time.zone.parse('2010-07-04')
     other_domain.discard
 
     background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name)