diff --git a/.travis.yml b/.travis.yml
index ae05d42b..96ac3dc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ rvm:
   - 2.1
   - 2.0
   - rbx-2
-script: bundle exec rake spec lint
+script: bundle exec rake spec rubocop
 install: bundle install --jobs=1
 cache: bundler
 branches:
diff --git a/Rakefile b/Rakefile
index 06d6a182..b84d37d4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,12 +3,10 @@ require "cucumber/rake/task"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
-task :default => [:spec, :lint]
+task :default => [:spec, :rubocop]
 RSpec::Core::RakeTask.new
 
 Cucumber::Rake::Task.new(:features)
 
-desc "Run RuboCop lint checks"
-RuboCop::RakeTask.new(:lint) do |task|
-  task.options = ["--lint"]
-end
+desc "Run RuboCop checks"
+RuboCop::RakeTask.new