diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 87e507f5b..b6146d224 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -7,7 +7,7 @@ namespace :ci do
       system("export DISPLAY=:99.0 && bundle exec rake cucumber")
       raise "Cucumber failed!" unless $?.exitstatus == 0
     else
-      ["rake spec", "rake jasmine:ci"].each do |cmd|
+      ["rake spec:fixtures", "rake spec", "rake jasmine:ci"].each do |cmd|
         puts "Running #{cmd}..."
         system("export DISPLAY=:99.0 && bundle exec #{cmd}")
         raise "#{cmd} failed!" unless $?.exitstatus == 0
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 5e7d804d7..8fab027ac 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -12,10 +12,8 @@ begin
 
   task :stats => "spec:statsetup"
 
-  desc "Run all specs in spec directory (excluding those tagged performance)"
-  RSpec::Core::RakeTask.new(:spec => :'spec:fixtures') do |t|
-    t.rspec_opts = ['--tag ~fixture --tag ~performance']
-  end
+  desc "Run all specs in spec directory"
+  RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
   desc "Run all specs that generate fixtures for rspec or jasmine"
   RSpec::Core::RakeTask.new(:'spec:fixtures' => spec_prereq) do |t|