diff --git a/lib/active_model/serializer/configuration.rb b/lib/active_model/serializer/configuration.rb
index ef57262c..b46cf8a5 100644
--- a/lib/active_model/serializer/configuration.rb
+++ b/lib/active_model/serializer/configuration.rb
@@ -6,7 +6,7 @@ module ActiveModel
 
       included do |base|
         base.config.array_serializer = ActiveModel::Serializer::ArraySerializer
-        base.config.adapter = :json
+        base.config.adapter = :json_api
       end
     end
   end
diff --git a/test/fixtures/poro.rb b/test/fixtures/poro.rb
index b66395c3..986178fe 100644
--- a/test/fixtures/poro.rb
+++ b/test/fixtures/poro.rb
@@ -1,3 +1,5 @@
+ActiveModel::Serializer.config.adapter = :json
+
 class Model
   def initialize(hash={})
     @attributes = hash
@@ -64,7 +66,7 @@ Author   = Class.new(Model)
 Bio      = Class.new(Model)
 Blog     = Class.new(Model)
 Role     = Class.new(Model)
-User = Class.new(Model)
+User     = Class.new(Model)
 Location = Class.new(Model)
 Place    = Class.new(Model)