diff --git a/lib/devise.rb b/lib/devise.rb
index 49cbf158..39d19a38 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -116,7 +116,7 @@ module Devise
   # Time interval you can access your account before confirming your account.
   mattr_accessor :confirm_within
   @@confirm_within = 0.days
-  
+
   # Defines which key will be used when confirming an account
   mattr_accessor :confirmation_keys
   @@confirmation_keys = [ :email ]
diff --git a/lib/generators/templates/devise.rb b/lib/generators/templates/devise.rb
index 0625a37f..35f0fd58 100644
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -67,7 +67,7 @@ Devise.setup do |config|
 
   # Defines which key will be used when confirming an account
   # config.confirmation_keys = [ :email ]
-  
+
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
diff --git a/test/models/confirmable_test.rb b/test/models/confirmable_test.rb
index 35fef1de..50420dd6 100644
--- a/test/models/confirmable_test.rb
+++ b/test/models/confirmable_test.rb
@@ -127,7 +127,7 @@ class ConfirmableTest < ActiveSupport::TestCase
       User.send_confirmation_instructions(:email => user.email)
     end
   end
-  
+
   test 'should always have confirmation token when email is sent' do
     user = new_user
     user.instance_eval { def confirmation_required?; false end }
@@ -210,7 +210,7 @@ class ConfirmableTest < ActiveSupport::TestCase
     user.save
     assert_not user.reload.active?
   end
-  
+
   test 'should be active without confirmation when confirmation is not required' do
     user = create_user
     user.instance_eval { def confirmation_required?; false end }
@@ -218,7 +218,7 @@ class ConfirmableTest < ActiveSupport::TestCase
     user.save
     assert user.reload.active?
   end
-  
+
   test 'should find a user to send email instructions for the user confirm it\'s email by authentication_keys' do
     swap Devise, :authentication_keys => [:username, :email] do
       user = create_user
@@ -226,13 +226,13 @@ class ConfirmableTest < ActiveSupport::TestCase
       assert_equal confirm_user, user
     end
   end
-  
+
   test 'should require all confirmation_keys' do
-      swap Devise, :confirmation_keys => [:username, :email] do
-          user = create_user
-          confirm_user = User.send_confirmation_instructions(:email => user.email)
-          assert_not confirm_user.persisted?
-          assert_equal "can't be blank", confirm_user.errors[:username].join
-      end
+    swap Devise, :confirmation_keys => [:username, :email] do
+      user = create_user
+      confirm_user = User.send_confirmation_instructions(:email => user.email)
+      assert_not confirm_user.persisted?
+      assert_equal "can't be blank", confirm_user.errors[:username].join
+    end
   end
 end
diff --git a/test/rails_app/config/initializers/devise.rb b/test/rails_app/config/initializers/devise.rb
index 7e30d32c..004d17bb 100644
--- a/test/rails_app/config/initializers/devise.rb
+++ b/test/rails_app/config/initializers/devise.rb
@@ -64,7 +64,7 @@ Devise.setup do |config|
 
   # Defines which key will be used when confirming an account
   # config.confirmation_keys = [ :email ]
-  
+
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks