diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 72ca8bb14c..a934679676 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -24,6 +24,9 @@ Spree.config do |config|
   config.order_updater_decorator = OrderUpdater
 end
 
+# Spree 2.0 recommends explicitly setting this here when using spree_auth_devise
+Spree.user_class = 'Spree::User'
+
 # Don't log users out when setting a new password
 Spree::Auth::Config[:signout_after_password_change] = false
 
diff --git a/lib/spree/api/testing_support/setup.rb b/lib/spree/api/testing_support/setup.rb
index 21702e19c5..2ec1bcecef 100644
--- a/lib/spree/api/testing_support/setup.rb
+++ b/lib/spree/api/testing_support/setup.rb
@@ -8,6 +8,7 @@ module Spree
             user.stub(:has_spree_role?).with("admin").and_return(false)
             user.stub(:enterprises) { [] }
             user.stub(:owned_groups) { [] }
+            user.stub(:spree_api_key) { "spree_api_key" }
             user
           end
         end