diff --git a/spec/core/model/annotation_provider_spec.rb b/spec/core/model/annotation_provider_spec.rb
index fbe97914..31c3c607 100644
--- a/spec/core/model/annotation_provider_spec.rb
+++ b/spec/core/model/annotation_provider_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe AnnotationProvider do
   include Support::ActiveRecord
diff --git a/spec/core/model/annotation_spec.rb b/spec/core/model/annotation_spec.rb
index 773faee2..1850a6d3 100644
--- a/spec/core/model/annotation_spec.rb
+++ b/spec/core/model/annotation_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Annotation do
   include Support::ActiveRecord
diff --git a/spec/core/model/broadcast_spec.rb b/spec/core/model/broadcast_spec.rb
index 67c4c63b..a3480e05 100644
--- a/spec/core/model/broadcast_spec.rb
+++ b/spec/core/model/broadcast_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Broadcast do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/compat_spec.rb b/spec/core/model/build/compat_spec.rb
index ce04d0a1..3e5495e2 100644
--- a/spec/core/model/build/compat_spec.rb
+++ b/spec/core/model/build/compat_spec.rb
@@ -1,4 +1,4 @@
-# require 'spec_helper'
+# require 'spec_helper_core'
 #
 # describe Build::Compat do
 #   include Support::ActiveRecord
diff --git a/spec/core/model/build/config/matrix_spec.rb b/spec/core/model/build/config/matrix_spec.rb
index 824dd89b..f2ced0e5 100644
--- a/spec/core/model/build/config/matrix_spec.rb
+++ b/spec/core/model/build/config/matrix_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 require 'core_ext/hash/deep_symbolize_keys'
 
 describe Build::Config::Matrix do
diff --git a/spec/core/model/build/config/obfuscate_spec.rb b/spec/core/model/build/config/obfuscate_spec.rb
index 99b4d094..838de065 100644
--- a/spec/core/model/build/config/obfuscate_spec.rb
+++ b/spec/core/model/build/config/obfuscate_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build::Config::Obfuscate do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/config_spec.rb b/spec/core/model/build/config_spec.rb
index 583da9cf..708786a8 100644
--- a/spec/core/model/build/config_spec.rb
+++ b/spec/core/model/build/config_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build::Config do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/denormalize_spec.rb b/spec/core/model/build/denormalize_spec.rb
index f77983c0..0077bb40 100644
--- a/spec/core/model/build/denormalize_spec.rb
+++ b/spec/core/model/build/denormalize_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build, 'denormalization' do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/matrix_spec.rb b/spec/core/model/build/matrix_spec.rb
index 1819ad48..e212911f 100644
--- a/spec/core/model/build/matrix_spec.rb
+++ b/spec/core/model/build/matrix_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build, 'matrix' do
   include Support::ActiveRecord
diff --git a/spec/core/model/build/metrics_spec.rb b/spec/core/model/build/metrics_spec.rb
index 722bd92c..76ad5a89 100644
--- a/spec/core/model/build/metrics_spec.rb
+++ b/spec/core/model/build/metrics_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 class BuildMetricsMock
   include do
diff --git a/spec/core/model/build/result_message_spec.rb b/spec/core/model/build/result_message_spec.rb
index 80592dda..40b22021 100644
--- a/spec/core/model/build/result_message_spec.rb
+++ b/spec/core/model/build/result_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build::ResultMessage do
   def message(data)
diff --git a/spec/core/model/build/states_spec.rb b/spec/core/model/build/states_spec.rb
index 1d5bdbbb..abe2995c 100644
--- a/spec/core/model/build/states_spec.rb
+++ b/spec/core/model/build/states_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 class BuildMock
   include Build::States
diff --git a/spec/core/model/build/update_branch_spec.rb b/spec/core/model/build/update_branch_spec.rb
index c1a9428a..3c59967a 100644
--- a/spec/core/model/build/update_branch_spec.rb
+++ b/spec/core/model/build/update_branch_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build::UpdateBranch do
   include Support::ActiveRecord
diff --git a/spec/core/model/build_spec.rb b/spec/core/model/build_spec.rb
index 8b1a6a3a..edd2b476 100644
--- a/spec/core/model/build_spec.rb
+++ b/spec/core/model/build_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Build do
   include Support::ActiveRecord
diff --git a/spec/core/model/commit_spec.rb b/spec/core/model/commit_spec.rb
index 7fc1ed01..a126421f 100644
--- a/spec/core/model/commit_spec.rb
+++ b/spec/core/model/commit_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Commit do
   include Support::ActiveRecord
diff --git a/spec/core/model/encrypted_column_spec.rb b/spec/core/model/encrypted_column_spec.rb
index e1c92261..cd27635d 100644
--- a/spec/core/model/encrypted_column_spec.rb
+++ b/spec/core/model/encrypted_column_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 class Travis::Model < ActiveRecord::Base
   describe EncryptedColumn do
diff --git a/spec/core/model/job/cleanup_spec.rb b/spec/core/model/job/cleanup_spec.rb
index 59a43b0c..572e9da7 100644
--- a/spec/core/model/job/cleanup_spec.rb
+++ b/spec/core/model/job/cleanup_spec.rb
@@ -1,4 +1,4 @@
-# require 'spec_helper'
+# require 'spec_helper_core'
 #
 # describe Job::Cleanup do
 #   include Support::ActiveRecord
diff --git a/spec/core/model/job/queue_spec.rb b/spec/core/model/job/queue_spec.rb
index 17f958f3..6036f3e8 100644
--- a/spec/core/model/job/queue_spec.rb
+++ b/spec/core/model/job/queue_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe 'Job::Queue' do
   def queue(*args)
diff --git a/spec/core/model/job/test_spec.rb b/spec/core/model/job/test_spec.rb
index a9d18a28..c2ebdadf 100644
--- a/spec/core/model/job/test_spec.rb
+++ b/spec/core/model/job/test_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Job::Test do
   include Support::ActiveRecord
diff --git a/spec/core/model/job_spec.rb b/spec/core/model/job_spec.rb
index 8a3b18d5..88a62c3e 100644
--- a/spec/core/model/job_spec.rb
+++ b/spec/core/model/job_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Job do
   include Support::ActiveRecord
diff --git a/spec/core/model/organization_spec.rb b/spec/core/model/organization_spec.rb
index 54b3db09..9920d539 100644
--- a/spec/core/model/organization_spec.rb
+++ b/spec/core/model/organization_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe User do
   include Support::ActiveRecord
diff --git a/spec/core/model/permission_spec.rb b/spec/core/model/permission_spec.rb
index da9dcdc5..2b475840 100644
--- a/spec/core/model/permission_spec.rb
+++ b/spec/core/model/permission_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Permission do
   include Support::ActiveRecord
diff --git a/spec/core/model/repository/settings/ssh_key_spec.rb b/spec/core/model/repository/settings/ssh_key_spec.rb
index 40a5b829..d2739643 100644
--- a/spec/core/model/repository/settings/ssh_key_spec.rb
+++ b/spec/core/model/repository/settings/ssh_key_spec.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Repository::Settings::SshKey do
   let(:private_key) {
diff --git a/spec/core/model/repository/settings_spec.rb b/spec/core/model/repository/settings_spec.rb
index d727d213..6ff7acd4 100644
--- a/spec/core/model/repository/settings_spec.rb
+++ b/spec/core/model/repository/settings_spec.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Repository::Settings do
   describe 'env_vars' do
diff --git a/spec/core/model/repository/status_image_spec.rb b/spec/core/model/repository/status_image_spec.rb
index e2d9cdf0..1c166cae 100644
--- a/spec/core/model/repository/status_image_spec.rb
+++ b/spec/core/model/repository/status_image_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Repository::StatusImage do
   include Support::ActiveRecord
diff --git a/spec/core/model/repository_spec.rb b/spec/core/model/repository_spec.rb
index 990a8032..e27f7042 100644
--- a/spec/core/model/repository_spec.rb
+++ b/spec/core/model/repository_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Repository do
   include Support::ActiveRecord
diff --git a/spec/core/model/request/approval_spec.rb b/spec/core/model/request/approval_spec.rb
index 8a591b3e..6b8a6e7f 100644
--- a/spec/core/model/request/approval_spec.rb
+++ b/spec/core/model/request/approval_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Request::Approval do
   include Travis::Testing::Stubs
diff --git a/spec/core/model/request/branches_spec.rb b/spec/core/model/request/branches_spec.rb
index 72c6cf50..05306818 100644
--- a/spec/core/model/request/branches_spec.rb
+++ b/spec/core/model/request/branches_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Request::Branches do
   include Travis::Testing::Stubs
diff --git a/spec/core/model/request/states_spec.rb b/spec/core/model/request/states_spec.rb
index 3d731189..6cc708c8 100644
--- a/spec/core/model/request/states_spec.rb
+++ b/spec/core/model/request/states_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Request::States do
   include Support::ActiveRecord
diff --git a/spec/core/model/request_spec.rb b/spec/core/model/request_spec.rb
index 41045ee4..4e06e832 100644
--- a/spec/core/model/request_spec.rb
+++ b/spec/core/model/request_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Request do
   include Support::ActiveRecord
diff --git a/spec/core/model/ssl_key_spec.rb b/spec/core/model/ssl_key_spec.rb
index 83240051..a621e301 100644
--- a/spec/core/model/ssl_key_spec.rb
+++ b/spec/core/model/ssl_key_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe SslKey do
   include Support::ActiveRecord
diff --git a/spec/core/model/token_spec.rb b/spec/core/model/token_spec.rb
index 08aee799..3bdd17ac 100644
--- a/spec/core/model/token_spec.rb
+++ b/spec/core/model/token_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Token do
   include Support::ActiveRecord
diff --git a/spec/core/model/url_spec.rb b/spec/core/model/url_spec.rb
index 094deadf..9001ab4f 100644
--- a/spec/core/model/url_spec.rb
+++ b/spec/core/model/url_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe Url do
   include Support::ActiveRecord
diff --git a/spec/core/model/user/oauth_spec.rb b/spec/core/model/user/oauth_spec.rb
index c8ddfd48..39920520 100644
--- a/spec/core/model/user/oauth_spec.rb
+++ b/spec/core/model/user/oauth_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe User::Oauth do
   include Support::ActiveRecord
diff --git a/spec/core/model/user_spec.rb b/spec/core/model/user_spec.rb
index d644e679..0b943283 100644
--- a/spec/core/model/user_spec.rb
+++ b/spec/core/model/user_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_core'
 
 describe User do
   include Support::ActiveRecord