diff --git a/.travis.yml b/.travis.yml
index 72a38d6..1ecb368 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,11 @@ gemfile:
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.0.gemfile
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.1.5
+      gemfile: gemfiles/rails5.0.gemfile
diff --git a/Appraisals b/Appraisals
index 4a08017..6be62b0 100644
--- a/Appraisals
+++ b/Appraisals
@@ -13,3 +13,9 @@ end
 appraise 'rails4.2' do
   gem 'rails', '~> 4.2.0'
 end
+
+appraise "rails5.0" do
+  gem "activerecord", "~> 5.0.0.beta3"
+  gem "railties", "~> 5.0.0.beta3"
+  gem "rspec-rails", "~> 3.5.0.beta3"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 586416b..76e617a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,27 +71,27 @@ GEM
       multi_json (~> 1.3)
     gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jdbc-sqlite3 (3.8.7)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jruby-openssl (0.9.6-java)
-    json (1.8.1)
-    json (1.8.1-java)
-    minitest (5.3.4)
-    multi_json (1.11.0)
+    json (1.8.3)
+    json (1.8.3-java)
+    minitest (5.8.4)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     power_assert (0.2.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.5.5)
+    rack-test (0.6.3)
       rack (>= 1.0)
     railties (4.1.1)
       actionpack (= 4.1.1)
       activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (11.1.2)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -111,9 +111,9 @@ GEM
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
     thor (0.19.1)
-    thread_safe (0.3.3)
-    thread_safe (0.3.3-java)
-    tzinfo (1.2.0)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -141,4 +141,4 @@ DEPENDENCIES
   uglifier
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile
new file mode 100644
index 0000000..2d13936
--- /dev/null
+++ b/gemfiles/rails5.0.gemfile
@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber", "1.3.19"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails", "~> 3.5.0.beta3"
+gem "uglifier"
+gem "test-unit"
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "therubyrhino", :platforms => :jruby
+gem "jruby-openssl", :platforms => :jruby
+gem "sqlite3", :platforms => :ruby
+gem "activerecord", "~> 5.0.0.beta3"
+gem "railties", "~> 5.0.0.beta3"
+
+gemspec :path => "../"