diff --git a/.travis.yml b/.travis.yml
index dab63dc..638cc5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ gemfile:
   - gemfiles/mongoid_30.gemfile
   - gemfiles/mongoid_31.gemfile
   - gemfiles/mongoid_40.gemfile
+  - gemfiles/mongoid_50.gemfile
   - gemfiles/sinatra_13.gemfile
   - gemfiles/sinatra_14.gemfile
 
@@ -51,6 +52,8 @@ matrix:
       gemfile: gemfiles/mongoid_31.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/mongoid_40.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid_50.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/mongo_mapper.gemfile
     - rvm: 1.9.3
diff --git a/Rakefile b/Rakefile
index f42d019..4d033b0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,6 +22,7 @@ namespace :spec do
     active_record_31
     active_record_30
     data_mapper_12
+    mongoid_50
     mongoid_40
     mongoid_31
     mongoid_30
diff --git a/gemfiles/mongoid_50.gemfile b/gemfiles/mongoid_50.gemfile
new file mode 100644
index 0000000..ca86255
--- /dev/null
+++ b/gemfiles/mongoid_50.gemfile
@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0'
+gem 'mongoid', '~> 5.0.0'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION > '1.9.3'
+
+group :development, :test do
+  gem 'database_cleaner', '~> 1.5.1'
+end
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > '2.1.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'