diff --git a/.travis.yml b/.travis.yml
index da3d395bf..c7d3ee080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,8 @@ rvm:
 
 env:
   - DB=postgres BUILD_TYPE=cucumber
-  - DB=postgres BUILD_TYPE=oauth-cucumber
   - DB=postgres BUILD_TYPE=other
   - DB=mysql BUILD_TYPE=cucumber
-  - DB=mysql BUILD_TYPE=oauth-cucumber
   - DB=mysql BUILD_TYPE=other
 
 
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index dc7d93ca4..443703fa2 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -6,16 +6,15 @@ namespace :ci do
       puts "Running cucumber features..."
       system("export DISPLAY=:99.0 && bundle exec rake cucumber")
       raise "Cucumber failed!" unless $?.exitstatus == 0
-    elsif ENV['BUILD_TYPE'] == 'oauth-cucumber'
-      puts "Running oauth cucumber features..."
-      system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
-      raise "OAuth cucumber failed!" unless $?.exitstatus == 0
     else
       ["rspec spec", "rake jasmine:ci"].each do |cmd|
         puts "Starting to run #{cmd}..."
         system("export DISPLAY=:99.0 && bundle exec #{cmd}")
         raise "#{cmd} failed!" unless $?.exitstatus == 0
       end
+      puts "Running oauth cucumber features..."
+      system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
+      raise "OAuth cucumber failed!" unless $?.exitstatus == 0
     end
   end