diff --git a/Appraisals b/Appraisals
index 8cf30868..48021174 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,12 +1,14 @@
 if RUBY_VERSION < '2.0'
   appraise '3.0' do
     gem 'rails', '~> 3.0.17'
+    gem 'strong_parameters'
   end
 
   appraise '3.1' do
     gem 'rails', '~> 3.1.8'
     gem 'jquery-rails'
     gem 'sass-rails'
+    gem 'strong_parameters'
   end
 end
 
@@ -14,4 +16,14 @@ appraise '3.2' do
   gem 'rails', '~> 3.2.13'
   gem 'jquery-rails'
   gem 'sass-rails'
+  gem 'strong_parameters'
+end
+
+appraise '4.0' do
+  gem 'rails', '4.0.0'
+  gem 'jquery-rails'
+  gem 'sass-rails', '~> 4.0.0'
+
+  # Test suite makes heavy use of attr_accessible
+  gem 'protected_attributes'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index f8ba4a5a..f77d1a2e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,10 +114,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    strong_parameters (0.1.5)
-      actionpack (~> 3.1)
-      activemodel (~> 3.1)
-      railties (~> 3.1)
     thor (0.17.0)
     tilt (1.3.6)
     treetop (1.4.12)
@@ -144,5 +140,4 @@ DEPENDENCIES
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
-  strong_parameters
   therubyrhino
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
index 2dfd8356..5d1ccef1 100644
--- a/gemfiles/3.0.gemfile
+++ b/gemfiles/3.0.gemfile
@@ -10,5 +10,6 @@ gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.0.17"
+gem "strong_parameters"
 
 gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
index bb7d8c02..a34f413e 100644
--- a/gemfiles/3.1.gemfile
+++ b/gemfiles/3.1.gemfile
@@ -12,5 +12,6 @@ gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.1.8"
 gem "jquery-rails"
 gem "sass-rails"
+gem "strong_parameters"
 
 gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
index 5e999b46..79961c87 100644
--- a/gemfiles/3.2.gemfile
+++ b/gemfiles/3.2.gemfile
@@ -12,5 +12,6 @@ gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.2.13"
 gem "jquery-rails"
 gem "sass-rails"
+gem "strong_parameters"
 
 gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile
new file mode 100644
index 00000000..de86479a
--- /dev/null
+++ b/gemfiles/4.0.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "shoulda-context", "~> 1.0.0"
+gem "sqlite3", :platform=>:ruby
+gem "activerecord-jdbc-adapter", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "jdbc-sqlite3", :platform=>:jruby
+gem "jruby-openssl", :platform=>:jruby
+gem "therubyrhino", :platform=>:jruby
+gem "rails", "4.0.0"
+gem "jquery-rails"
+gem "sass-rails", "~> 4.0.0"
+gem "protected_attributes"
+
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/4.0.gemfile.lock b/gemfiles/4.0.gemfile.lock
new file mode 100644
index 00000000..5ec38007
--- /dev/null
+++ b/gemfiles/4.0.gemfile.lock
@@ -0,0 +1,152 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-matchers (2.3.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.1.13)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
+    builder (3.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.6)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    ffi (1.9.0)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    i18n (0.6.5)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.24)
+    minitest (4.7.5)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.9)
+    multi_test (0.0.2)
+    polyglot (0.3.3)
+    protected_attributes (1.0.3)
+      activemodel (>= 4.0.0, < 5.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sass (3.2.10)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0)
+    shoulda-context (1.0.2)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 0.4)
+  aruba
+  bourne (~> 1.3)
+  bundler (~> 1.1)
+  cucumber (~> 1.1)
+  jdbc-sqlite3
+  jquery-rails
+  jruby-openssl
+  protected_attributes
+  rails (= 4.0.0)
+  rake (>= 0.9.2)
+  rspec-rails (~> 2.13)
+  sass-rails (~> 4.0.0)
+  shoulda-context (~> 1.0.0)
+  shoulda-matchers!
+  sqlite3
+  therubyrhino
diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec
index 0e586108..c04a69b4 100644
--- a/shoulda-matchers.gemspec
+++ b/shoulda-matchers.gemspec
@@ -29,5 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rails',       '~> 3.0')
   s.add_development_dependency('rake',        '>= 0.9.2')
   s.add_development_dependency('rspec-rails', '~> 2.13')
-  s.add_development_dependency('strong_parameters')
 end