diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb
index ab8d6a77df..b673e28be6 100644
--- a/spec/controllers/spree/admin/image_settings_controller_spec.rb
+++ b/spec/controllers/spree/admin/image_settings_controller_spec.rb
@@ -1,28 +1,27 @@
 require 'spec_helper'
 
 describe Spree::Admin::ImageSettingsController do
-  stub_authorization!
+  include AuthenticationWorkflow
+
+  before { login_as_admin }
 
   context "updating image settings" do
     it "should be able to update paperclip settings" do
-      spree_put :update, { :preferences => {
-        "attachment_path"        => "foo/bar",
-        "attachment_default_url" => "baz/bar"
-        }
-      }
+      spree_put :update, preferences: { "attachment_path" => "foo/bar", "attachment_default_url" => "baz/bar" }
+
       Spree::Config[:attachment_path].should == "foo/bar"
       Spree::Config[:attachment_default_url].should == "baz/bar"
     end
 
     context "paperclip styles" do
       it "should be able to update the paperclip styles" do
-        spree_put :update, {  "attachment_styles" => { "thumb" => "25x25>" } }
+        spree_put :update, "attachment_styles" => { "thumb" => "25x25>" }
         updated_styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
         updated_styles["thumb"].should == "25x25>"
       end
 
       it "should be able to add a new style" do
-        spree_put :update, { "attachment_styles" => { }, "new_attachment_styles" => { "1" => { "name" => "jumbo", "value" => "2000x2000>" } } }
+        spree_put :update, "attachment_styles" => {}, "new_attachment_styles" => { "1" => { "name" => "jumbo", "value" => "2000x2000>" } }
         styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
         styles["jumbo"].should == "2000x2000>"
       end
@@ -34,14 +33,14 @@ describe Spree::Admin::ImageSettingsController do
       end
 
       it "should be able to update s3 settings" do
-        spree_put :update, { :preferences => {
+        spree_put :update, preferences:
+        {
           "use_s3"        => "1",
           "s3_access_key" => "a_valid_key",
           "s3_secret"     => "a_secret",
           "s3_bucket"     => "some_bucket"
-          }
         }
-        Spree::Config[:use_s3].should be_true
+        Spree::Config[:use_s3].should be_truthy
         Spree::Config[:s3_access_key].should == "a_valid_key"
         Spree::Config[:s3_secret].should     == "a_secret"
         Spree::Config[:s3_bucket].should     == "some_bucket"
@@ -51,13 +50,13 @@ describe Spree::Admin::ImageSettingsController do
         before(:each) { Spree::Config[:use_s3] = true }
 
         it "should be able to update the s3 headers" do
-          spree_put :update, { :preferences => { "use_s3" => "1" }, "s3_headers" => { "Cache-Control" => "max-age=1111" } }
+          spree_put :update, preferences: { "use_s3" => "1" }, "s3_headers" => { "Cache-Control" => "max-age=1111" }
           headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
           headers["Cache-Control"].should == "max-age=1111"
         end
 
         it "should be able to add a new header" do
-          spree_put :update, { "s3_headers" => { }, "new_s3_headers" => { "1" => { "name" => "Charset", "value" => "utf-8" } } }
+          spree_put :update, "s3_headers" => {}, "new_s3_headers" => { "1" => { "name" => "Charset", "value" => "utf-8" } }
           headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
           headers["Charset"].should == "utf-8"
         end
@@ -65,4 +64,3 @@ describe Spree::Admin::ImageSettingsController do
     end
   end
 end
-