diff --git a/.rspec b/.rspec
index 3707d59be..468628fe7 100644
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,3 @@
 --format Fuubar
 --profile
 --color
---tag ~performance
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 443703fa2..87e507f5b 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -7,8 +7,8 @@ namespace :ci do
       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}..."
+      ["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
       end
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 49ac31e65..eb9db378f 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -12,8 +12,15 @@ begin
 
   task :stats => "spec:statsetup"
 
-  desc "Run all specs in spec directory (excluding plugin specs)"
-  RSpec::Core::RakeTask.new(:spec => spec_prereq)
+  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 ~performance']
+  end
+
+  desc "Run all specs that generate fixtures for rspec or jasmine"
+  RSpec::Core::RakeTask.new(:'spec:fixtures' => spec_prereq) do |t|
+    t.rspec_opts = ['--tag fixture']
+  end
 
   desc "Run the specs with rcov"
   RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|