diff --git a/app/controllers/spree/admin/base_controller_decorator.rb b/app/controllers/spree/admin/base_controller_decorator.rb
index 716f4ef50f..fb0e54baa8 100644
--- a/app/controllers/spree/admin/base_controller_decorator.rb
+++ b/app/controllers/spree/admin/base_controller_decorator.rb
@@ -3,6 +3,8 @@ require 'spree/core/controller_helpers/respond_with_decorator'
 Spree::Admin::BaseController.class_eval do
   include I18nHelper
 
+  layout 'spree/layouts/admin'
+
   before_filter :set_locale
   before_filter :warn_invalid_order_cycles
 
diff --git a/spec/controllers/spree/admin/base_controller_spec.rb b/spec/controllers/spree/admin/base_controller_spec.rb
index b0b5637cd2..014809da00 100644
--- a/spec/controllers/spree/admin/base_controller_spec.rb
+++ b/spec/controllers/spree/admin/base_controller_spec.rb
@@ -9,8 +9,8 @@ describe Spree::Admin::BaseController, type: :controller do
   end
 
   it "redirects to Angular login" do
-    get :index
-    response.should redirect_to root_path(anchor: "login?after_login=/anonymous")
+    spree_get :index
+    response.should redirect_to root_path(anchor: "login?after_login=/spree/admin/base")
   end
 
   describe "displaying error messages for active distributors not ready for checkout" do
@@ -88,15 +88,15 @@ describe Spree::Admin::BaseController, type: :controller do
 
   describe "determining the name of the serializer to be used" do
     before do
-      class Api::Admin::AllowedPrefixAnonymouSerializer;end;
-      class Api::Admin::AnonymouSerializer;end;
+      class Api::Admin::AllowedPrefixBaseSerializer;end;
+      class Api::Admin::BaseSerializer;end;
       allow(controller).to receive(:ams_prefix_whitelist) { [:allowed_prefix] }
     end
 
     context "when a prefix is passed in" do
       context "and the prefix appears in the whitelist" do
         it "returns the requested serializer" do
-          expect(controller.send(:serializer, 'allowed_prefix')).to eq Api::Admin::AllowedPrefixAnonymouSerializer
+          expect(controller.send(:serializer, 'allowed_prefix')).to eq Api::Admin::AllowedPrefixBaseSerializer
         end
       end
 
@@ -109,7 +109,7 @@ describe Spree::Admin::BaseController, type: :controller do
 
     context "when no prefix is passed in" do
       it "returns the default serializer" do
-        expect(controller.send(:serializer, nil)).to eq Api::Admin::AnonymouSerializer
+        expect(controller.send(:serializer, nil)).to eq Api::Admin::BaseSerializer
       end
     end
   end