diff --git a/Rakefile b/Rakefile
index 8dc5b3aaa..0a1d1f00f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,3 +9,5 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
+
+task :default => :test
diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec
index a6fa3dbc4..7cdb28714 100644
--- a/active_model_serializers.gemspec
+++ b/active_model_serializers.gemspec
@@ -12,6 +12,8 @@ Gem::Specification.new do |gem|
   gem.name          = "active_model_serializers"
   gem.require_paths = ["lib"]
   gem.version       = "0.0.1"
-  
-  gem.add_dependency "rails", "~> 3.0"
+
+  gem.add_dependency 'activemodel', '~> 3.0'
+
+  gem.add_development_dependency "rails", "~> 3.0"
 end
diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 7a1e4c911..97d1cd51a 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -16,7 +16,7 @@ module ActionController
   #
   #    class ApplicationController < ActionController::Base
   #      private
-  #      
+  #
   #      def serialization_scope
   #        current_user
   #      end
@@ -48,4 +48,4 @@ def serialization_scope(scope)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb
index 0f1e14b9f..a06f5b27a 100644
--- a/lib/active_model_serializers.rb
+++ b/lib/active_model_serializers.rb
@@ -23,12 +23,13 @@ def active_model_serializer
   end
 end
 
-require "action_controller"
+begin
+  require 'action_controller'
+  require 'action_controller/serialization'
 
-module ActionController
-  autoload :Serialization, "action_controller/serialization"
+  ActiveSupport.on_load(:action_controller) do
+    include ::ActionController::Serialization
+  end
+rescue LoadError => ex
+  # rails on installed, continuing
 end
-
-ActiveSupport.on_load(:action_controller) do
-  include ::ActionController::Serialization
-end
\ No newline at end of file
diff --git a/test/generators_test.rb b/test/generators_test.rb
index 0e3886339..001a1d7e9 100644
--- a/test/generators_test.rb
+++ b/test/generators_test.rb
@@ -1,4 +1,4 @@
-require 'rails'
+require 'test_helper'
 
 class Foo < Rails::Application
 end
diff --git a/test/serialization_test.rb b/test/serialization_test.rb
index 627baa8cd..05abd8623 100644
--- a/test/serialization_test.rb
+++ b/test/serialization_test.rb
@@ -169,4 +169,4 @@ def test_render_json_with_serializer_api_but_without_serializer
     get :render_json_with_serializer_api_but_without_serializer
     assert_match '{"serializable_object":true}', @response.body
   end
-end
\ No newline at end of file
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 009aac0b7..2942aa586 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,6 +7,8 @@
 require "active_support/json"
 require "test/unit"
 
+require 'rails'
+
 module TestHelper
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
@@ -21,4 +23,4 @@ module TestHelper
   setup do
     @routes = ::TestHelper::Routes
   end
-end
\ No newline at end of file
+end