diff --git a/.travis.yml b/.travis.yml
index 875baab4f..8247d1340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_script:
   - RAILS_ENV=test bundle exec rake db:seed
   - RAILS_ENV=test bundle exec rake zonefile:replace_procedure
 script:
-  - RAILS_ENV=test bundle exec rake spec:models
+  - RAILS_ENV=test bundle exec rake
 cache: bundler
 services:
   - postgresql
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index ac5b5159d..072d477de 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -15,7 +15,7 @@ begin
 
     desc 'Run all but EPP specs'
     RSpec::Core::RakeTask.new('test:other') do |t|
-      t.rspec_opts = '--tag ~epp'
+      t.rspec_opts = '--tag ~epp --tag ~feature'
     end
 
     desc 'Run all but EPP specs'