diff --git a/spec/grape_ams_spec.rb b/spec/grape_ams_spec.rb
index cefd83e..5df8c6d 100644
--- a/spec/grape_ams_spec.rb
+++ b/spec/grape_ams_spec.rb
@@ -1,5 +1,8 @@
 require 'spec_helper'
-require 'spec_fakes'
+require 'support/models/user'
+require 'support/models/blog_post'
+require 'support/serializers/user_serializer'
+require 'support/serializers/blog_post_serializer'
 require "grape-active_model_serializers"
 
 describe Grape::ActiveModelSerializers do
diff --git a/spec/spec_fakes.rb b/spec/spec_fakes.rb
deleted file mode 100644
index defd395..0000000
--- a/spec/spec_fakes.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-
-class User
-  include ActiveModel::SerializerSupport
-  attr_accessor :first_name, :last_name, :password, :email
-
-  def initialize(params={})
-    params.each do |k,v|
-      instance_variable_set("@#{k}", v) unless v.nil?
-    end
-  end
-end
-
-class UserSerializer < ActiveModel::Serializer
-  attributes :first_name, :last_name
-end
-
-class BlogPost
-  include ActiveModel::SerializerSupport
-  attr_accessor :title, :body
-
-  def initialize(params={})
-    params.each do |k,v|
-      instance_variable_set("@#{k}", v) unless v.nil?
-    end
-  end
-end
-
-class BlogPostSerializer < ActiveModel::Serializer
-  attributes :title, :body
-end
diff --git a/spec/support/models/blog_post.rb b/spec/support/models/blog_post.rb
new file mode 100644
index 0000000..991f53f
--- /dev/null
+++ b/spec/support/models/blog_post.rb
@@ -0,0 +1,10 @@
+class BlogPost
+  include ActiveModel::SerializerSupport
+  attr_accessor :title, :body
+
+  def initialize(params={})
+    params.each do |k,v|
+      instance_variable_set("@#{k}", v) unless v.nil?
+    end
+  end
+end
diff --git a/spec/support/models/user.rb b/spec/support/models/user.rb
new file mode 100644
index 0000000..8e6b6b8
--- /dev/null
+++ b/spec/support/models/user.rb
@@ -0,0 +1,10 @@
+class User
+  include ActiveModel::SerializerSupport
+  attr_accessor :first_name, :last_name, :password, :email
+
+  def initialize(params={})
+    params.each do |k,v|
+      instance_variable_set("@#{k}", v) unless v.nil?
+    end
+  end
+end
diff --git a/spec/support/serializers/blog_post_serializer.rb b/spec/support/serializers/blog_post_serializer.rb
new file mode 100644
index 0000000..4deb97c
--- /dev/null
+++ b/spec/support/serializers/blog_post_serializer.rb
@@ -0,0 +1,3 @@
+class BlogPostSerializer < ActiveModel::Serializer
+  attributes :title, :body
+end
diff --git a/spec/support/serializers/user_serializer.rb b/spec/support/serializers/user_serializer.rb
new file mode 100644
index 0000000..5f43e65
--- /dev/null
+++ b/spec/support/serializers/user_serializer.rb
@@ -0,0 +1,3 @@
+class UserSerializer < ActiveModel::Serializer
+  attributes :first_name, :last_name
+end