diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index 1c2c37fa5..fa26ef408 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -14,7 +14,7 @@ issues_001:
   author_id: 2
   status_id: 1
   start_date: <%= 1.day.ago.to_date.to_s(:db) %>
-  due_date: <%= 10.day.from_now.to_date.to_s(:db) %>
+  due_date: <%= 10.day.from_now(Time.now).to_date.to_s(:db) %>
   estimated_hours: 200.0
   root_id: 1
   lft: 1
@@ -57,7 +57,7 @@ issues_003:
   author_id: 2
   status_id: 1
   start_date: <%= 15.day.ago.to_date.to_s(:db) %>
-  due_date: <%= 5.day.ago.to_date.to_s(:db) %>
+  due_date: <%= 5.day.ago(Time.now).to_date.to_s(:db) %>
   estimated_hours: 1.0
   root_id: 3
   lft: 1
@@ -112,7 +112,7 @@ issues_006:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
-  due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
+  due_date: <%= 1.days.from_now(Time.now).to_date.to_s(:db) %>
   root_id: 6
   lft: 1
   rgt: 2
@@ -172,7 +172,7 @@ issues_009:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
-  due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
+  due_date: <%= 1.days.from_now(Time.now).to_date.to_s(:db) %>
   root_id: 9
   lft: 1
   rgt: 2
@@ -191,7 +191,7 @@ issues_010:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
-  due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
+  due_date: <%= 1.days.from_now(Time.now).to_date.to_s(:db) %>
   root_id: 10
   lft: 1
   rgt: 2
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index fa3b5516c..4cf3656b4 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -652,7 +652,7 @@ class MailerTest < ActiveSupport::TestCase
     with_settings :default_language => 'en' do
       Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 5,
                       :subject => 'Closed issue', :assigned_to_id => 3,
-                      :due_date => 5.days.from_now,
+                      :due_date => 5.days.from_now(Time.now).to_date,
                       :author_id => 2)
       ActionMailer::Base.deliveries.clear
 
@@ -683,12 +683,12 @@ class MailerTest < ActiveSupport::TestCase
       group.users << user_dlopper
 
       Issue.update_all(:assigned_to_id => nil)
-      due_date = 10.days.from_now
+      due_date = 10.days.from_now(Time.now).to_date
       Issue.update(1, :due_date => due_date, :assigned_to_id => user_dlopper.id)
       Issue.update(2, :due_date => due_date, :assigned_to_id => group.id)
       Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 1,
                       :subject => 'Assigned to group', :assigned_to => group,
-                      :due_date => 5.days.from_now,
+                      :due_date => 5.days.from_now(Time.now).to_date,
                       :author_id => 2)
       ActionMailer::Base.deliveries.clear
 
@@ -706,8 +706,9 @@ class MailerTest < ActiveSupport::TestCase
   def test_reminders_with_version_option
     with_settings :default_language => 'en' do
       version = Version.generate!(:name => 'Acme', :project_id => 1)
-      Issue.generate!(:assigned_to => User.find(2), :due_date => 5.days.from_now)
-      Issue.generate!(:assigned_to => User.find(3), :due_date => 5.days.from_now, :fixed_version => version)
+      due_date = 5.days.from_now(Time.now).to_date
+      Issue.generate!(:assigned_to => User.find(2), :due_date => due_date)
+      Issue.generate!(:assigned_to => User.find(3), :due_date => due_date, :fixed_version => version)
       ActionMailer::Base.deliveries.clear
 
       Mailer.reminders(:days => 42, :version => 'acme')
@@ -722,7 +723,7 @@ class MailerTest < ActiveSupport::TestCase
       member = Member.create!(:project_id => 2, :principal => user, :role_ids => [1])
       Issue.create!(:project_id => 2, :tracker_id => 1, :status_id => 1,
                       :subject => 'Issue dlopper should not see', :assigned_to_id => 3,
-                      :due_date => 5.days.from_now,
+                      :due_date => 5.days.from_now(Time.now).to_date,
                       :author_id => 2)
       member.destroy
       ActionMailer::Base.deliveries.clear
@@ -737,11 +738,12 @@ class MailerTest < ActiveSupport::TestCase
 
   def test_reminders_should_sort_issues_by_due_date
     user = User.find(2)
-    Issue.generate!(:assigned_to => user, :due_date => 2.days.from_now, :subject => 'quux')
-    Issue.generate!(:assigned_to => user, :due_date => 0.days.from_now, :subject => 'baz')
-    Issue.generate!(:assigned_to => user, :due_date => 1.days.from_now, :subject => 'qux')
-    Issue.generate!(:assigned_to => user, :due_date => -1.days.from_now, :subject => 'foo')
-    Issue.generate!(:assigned_to => user, :due_date => -1.days.from_now, :subject => 'bar')
+    time_now = Time.now
+    Issue.generate!(:assigned_to => user, :due_date => 2.days.from_now(time_now).to_date, :subject => 'quux')
+    Issue.generate!(:assigned_to => user, :due_date => 0.days.from_now(time_now).to_date, :subject => 'baz')
+    Issue.generate!(:assigned_to => user, :due_date => 1.days.from_now(time_now).to_date, :subject => 'qux')
+    Issue.generate!(:assigned_to => user, :due_date => -1.days.from_now(time_now).to_date, :subject => 'foo')
+    Issue.generate!(:assigned_to => user, :due_date => -1.days.from_now(time_now).to_date, :subject => 'bar')
     ActionMailer::Base.deliveries.clear
 
     Mailer.reminders(:days => 7, :users => [user.id])