diff --git a/.travis.yml b/.travis.yml
index 5373313..b267c31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,4 @@ rvm:
   - rbx-2
   - ruby-head
   - 2.1
+script: bundle exec rake ci
diff --git a/Rakefile b/Rakefile
index 6534453..dc7b216 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,16 @@
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
-desc 'Run all scenarios'
-Cucumber::Rake::Task.new(:features) do |t|
+task default: %i[features spec]
+
+Cucumber::Rake::Task.new(:features)
+
+Cucumber::Rake::Task.new(:features_no_sshd) do |t|
+  t.instance_eval { @desc << ' excluding @sshd'}
   t.cucumber_opts = '--tags ~@sshd'
 end
 
-desc 'Run all specs'
 RSpec::Core::RakeTask.new(:spec)
 
-
-task default: [:features, :spec]
+desc 'Run CI test suite'
+task ci: %i[features_no_sshd spec]