diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 8a08f3f514c..ce8c6b0241c 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -22,7 +22,7 @@ class EmailToken < ActiveRecord::Base
   end
 
   def self.confirm_valid_after
-    SiteSetting.email_token_grace_period_hours.ago
+    SiteSetting.email_token_grace_period_hours.hours.ago
   end
 
   def self.unconfirmed
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e63401fc8d7..b885d72ab32 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -40,7 +40,5 @@ Discourse::Application.configure do
   config.assets.compile = true
   config.assets.digest = false
 
-  # silence deprecation warnings in test
   config.eager_load = false
-  ActiveSupport::Deprecation.silenced = true
 end