diff --git a/.travis.yml b/.travis.yml
index 6bff3752b2a..07f8146f3de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ services:
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
-  - "bundle exec rake db:setup"
-  - "bundle exec rake db:seed_fu"
 script: "bundle exec rake $TASK --trace"
 notifications:
   email: false
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index 83e794189d2..2c9b9978933 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -2,7 +2,6 @@ namespace :gitlab do
   desc "GITLAB | Run all tests"
   task :test do
     cmds = [
-      %W(rake gitlab:setup),
       %W(rake spinach),
       %W(rake spec),
       %W(rake jasmine:ci)
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
new file mode 100644
index 00000000000..4e562459e15
--- /dev/null
+++ b/lib/tasks/spec.rake
@@ -0,0 +1,14 @@
+Rake::Task["spec"].clear
+
+desc "GITLAB | Run specs"
+task :spec do
+  cmds = [
+    %W(rake gitlab:setup),
+    %W(rspec spec),
+  ]
+
+  cmds.each do |cmd|
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
+    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+  end
+end
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
new file mode 100644
index 00000000000..60d4d6343b7
--- /dev/null
+++ b/lib/tasks/spinach.rake
@@ -0,0 +1,14 @@
+Rake::Task["spinach"].clear
+
+desc "GITLAB | Run spinach"
+task :spinach do
+  cmds = [
+    %W(rake gitlab:setup),
+    %W(spinach),
+  ]
+
+  cmds.each do |cmd|
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
+    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+  end
+end