diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index bd626ed3a..19b5bfa0f 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -2,10 +2,16 @@ namespace :ci do
 
   desc "Run tests in the cloud. ZOMG!"
   task :travis do
-    ["rspec spec", "rake jasmine:ci", "rake cucumber"].each do |cmd|
-      puts "Starting to run #{cmd}..."
-      system("export DISPLAY=:99.0 && bundle exec #{cmd}")
-      raise "#{cmd} failed!" unless $?.exitstatus == 0
+    if ENV['BUILD_TYPE'] == 'cucumber'
+      puts "Running cucumber features..."
+      system("export DISPLAY=:99.0 && bundle exec rake cucumber")
+      raise "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
     end
   end