diff --git a/.travis.yml b/.travis.yml
index 7747c18..f6d8bee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,11 @@
 rvm:
-  - 1.9.3
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - rbx-2.2.10
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
+  - 2.2.4
 
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 
 before_script:
   - "cp config/database.travis.yml config/database.yml"
   - "RAILS_ENV=test bundle exec rake db:create"
+
diff --git a/Rakefile b/Rakefile
index c5f5928..eea4cc8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,15 +6,11 @@ GrapeOnRails::Application.load_tasks
 
 if Rails.env.test? || Rails.env.development?
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:test) do |spec|
-    # do not run integration tests, doesn't work on TravisCI
-    spec.pattern = FileList['spec/api/*_spec.rb', 'spec/controllers/*_spec.rb', 'spec/helpers/*_spec.rb', 'spec/views/*_spec.rb']
-  end
 
   Rake::Task[:default].prerequisites.clear
 
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new(:rubocop)
 
-  task default: [:rubocop, :test]
+  task default: [:rubocop, :spec]
 end