diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 414344a7f75..dbdbae9d787 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,116 +137,23 @@ bundler:audit:
 
 # Ruby 2.1 jobs
 
-spec:feature:ruby21:
+spec:ruby21:
   image: ruby:2.1
   script:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
   tags:
     - ruby
     - mysql
   only:
   - master
 
-spec:api:ruby21:
+spinach:ruby21:
   image: ruby:2.1
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
   tags:
     - ruby
     - mysql
   only:
   - master
-
-spec:models:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spec:lib:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spec:services:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spec:benchmark:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test bundle exec rake spec:benchmark
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
-  only:
-  - master
-
-spec:other:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spinach:project:half:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spinach:project:rest:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-spinach:other:ruby21:
-  image: ruby:2.1
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
-  tags:
-    - ruby
-    - mysql
-  only:
-  - master
-
-bundler:audit:ruby21:
-  image: ruby:2.1
-  script:
-    - "bundle exec bundle-audit update"
-    - "bundle exec bundle-audit check"
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
-  only:
-  - master