diff --git a/.github/workflows/composite/setup/action.yml b/.github/workflows/composite/setup/action.yml
index 8d6489af06d..f92181dab2c 100644
--- a/.github/workflows/composite/setup/action.yml
+++ b/.github/workflows/composite/setup/action.yml
@@ -43,3 +43,6 @@ runs:
       with:
         bundler-cache: true
         working-directory: ${{ inputs.WORKING_DIRECTORY }}
+    - name: Enable YJIT
+      run: echo "RUBY_YJIT_ENABLE=1" >> "$GITHUB_ENV"
+      shell: bash
diff --git a/lib/cloud_controller/diego/reporters/instances_reporter.rb b/lib/cloud_controller/diego/reporters/instances_reporter.rb
index 441e848f6c4..7a6ebbd4c6c 100644
--- a/lib/cloud_controller/diego/reporters/instances_reporter.rb
+++ b/lib/cloud_controller/diego/reporters/instances_reporter.rb
@@ -1,6 +1,7 @@
 require 'utils/workpool'
 require 'cloud_controller/diego/constants'
 require 'cloud_controller/diego/reporters/reporter_mixins'
+require 'diego/lrp_constants'
 
 module VCAP::CloudController
   module Diego
diff --git a/lib/cloud_controller/telemetry_logger.rb b/lib/cloud_controller/telemetry_logger.rb
index 7b6e9b9df41..bbf4028cffc 100644
--- a/lib/cloud_controller/telemetry_logger.rb
+++ b/lib/cloud_controller/telemetry_logger.rb
@@ -1,3 +1,4 @@
+require 'oj'
 require 'openssl'
 
 module VCAP::CloudController
diff --git a/spec/db_spec_helper.rb b/spec/db_spec_helper.rb
index 426fa2a8c89..ec5ed14d61b 100644
--- a/spec/db_spec_helper.rb
+++ b/spec/db_spec_helper.rb
@@ -4,6 +4,10 @@
   require 'rspec/collection_matchers'
 
   require 'rails'
+  require 'oj'
+  require 'sequel'
+  Sequel.default_timezone = :utc
+
   require 'support/bootstrap/spec_bootstrap'
   require 'support/database_isolation'
   require 'sequel_plugins/sequel_plugins'
diff --git a/spec/fog_spec_helper.rb b/spec/fog_spec_helper.rb
new file mode 100644
index 00000000000..3d908888544
--- /dev/null
+++ b/spec/fog_spec_helper.rb
@@ -0,0 +1,21 @@
+# Use this helper for specs that need Fog/blobstore functionality with
+# a clean state between tests (upload, download, delete operations).
+#
+# This helper resets Fog mocks and recreates buckets before each test.
+#
+# For specs that don't need blobstore isolation, use spec_helper instead.
+
+require 'spec_helper'
+
+RSpec.configure do |config|
+  config.before(:each, :fog_isolation) do
+    Fog::Mock.reset
+
+    if Fog.mock?
+      CloudController::DependencyLocator.instance.droplet_blobstore.ensure_bucket_exists
+      CloudController::DependencyLocator.instance.package_blobstore.ensure_bucket_exists
+      CloudController::DependencyLocator.instance.global_app_bits_cache.ensure_bucket_exists
+      CloudController::DependencyLocator.instance.buildpack_blobstore.ensure_bucket_exists
+    end
+  end
+end
diff --git a/spec/lightweight_spec_helper.rb b/spec/lightweight_spec_helper.rb
index 89b08acd137..cef83354706 100644
--- a/spec/lightweight_spec_helper.rb
+++ b/spec/lightweight_spec_helper.rb
@@ -1,18 +1,34 @@
 $LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'app')))
 $LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'lib')))
+$LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'middleware')))
 
 require 'active_support/all'
+require 'active_model'
+require 'rspec/its'
 require 'pry'
 # So that specs using this helper don't fail with undefined constant error
 module VCAP
   module CloudController
+    # Minimal Config stub for message validation specs
+    # Only define if not already defined (avoid conflict with spec_helper)
+    unless defined?(Config)
+      class Config
+        def self.config
+          @config ||= new
+        end
+
+        def get(*_keys)
+          nil
+        end
+      end
+    end
   end
 end
 
 class StubConfig
   def self.prepare(example, **data)
     config = new(data)
-    example.allow(TestConfig).to example.receive(:config).and_return(config)
+    example.allow(TestConfig).to example.receive(:config).and_return(config) if defined?(TestConfig)
     example.allow(VCAP::CloudController::Config).to example.receive(:config).and_return(config)
   end
 
@@ -20,8 +36,8 @@ def initialize(data)
     @data = data
   end
 
-  def get(key)
-    data[key]
+  def get(*keys)
+    keys.inject(data) { |memo, key| memo.is_a?(Hash) ? memo[key] : nil }
   end
 
   alias_method :[], :get
@@ -33,4 +49,26 @@ def get(key)
 
 RSpec.configure do |rspec_config|
   rspec_config.expose_dsl_globally = false
+
+  rspec_config.before do
+    if defined?(VCAP::CloudController::Config) && VCAP::CloudController::Config.config.nil?
+      allow(VCAP::CloudController::Config).to receive(:config).and_return(StubConfig.new({}))
+    end
+  end
+end
+
+# errors_on helper from rspec-collection_matchers gem
+# Enables: expect(message.errors_on(:attribute)).to include("error message")
+# This extension is added when ActiveModel::Validations is loaded
+if defined?(ActiveModel::Validations)
+  module ::ActiveModel::Validations
+    def errors_on(attribute, options={})
+      valid_args = [options[:context]].compact
+      valid?(*valid_args)
+
+      [errors[attribute]].flatten.compact
+    end
+
+    alias_method :error_on, :errors_on
+  end
 end
diff --git a/spec/unit/controllers/runtime/buildpack_bits_controller_spec.rb b/spec/unit/controllers/runtime/buildpack_bits_controller_spec.rb
index a18fb1e7248..a372453849d 100644
--- a/spec/unit/controllers/runtime/buildpack_bits_controller_spec.rb
+++ b/spec/unit/controllers/runtime/buildpack_bits_controller_spec.rb
@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 ## NOTICE: Prefer request specs over controller specs as per ADR #0003 ##
 
 module VCAP::CloudController
-  RSpec.describe VCAP::CloudController::BuildpackBitsController do
+  RSpec.describe VCAP::CloudController::BuildpackBitsController, :fog_isolation do
     let(:user) { make_user }
     let(:filename) { 'file.zip' }
     let(:sha_valid_zip) { Digester.new(algorithm: OpenSSL::Digest::SHA256).digest_file(valid_zip) }
diff --git a/spec/unit/controllers/runtime/buildpacks_controller_spec.rb b/spec/unit/controllers/runtime/buildpacks_controller_spec.rb
index 0eecd522bdd..35f37501bc6 100644
--- a/spec/unit/controllers/runtime/buildpacks_controller_spec.rb
+++ b/spec/unit/controllers/runtime/buildpacks_controller_spec.rb
@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 ## NOTICE: Prefer request specs over controller specs as per ADR #0003 ##
 
 module VCAP::CloudController
-  RSpec.describe VCAP::CloudController::BuildpacksController do
+  RSpec.describe VCAP::CloudController::BuildpacksController, :fog_isolation do
     def ordered_buildpacks
       Buildpack.order(:position).map { |bp| [bp.name, bp.position] }
     end
diff --git a/spec/unit/controllers/runtime/stagings_controller_spec.rb b/spec/unit/controllers/runtime/stagings_controller_spec.rb
index 2be7d38dc8c..e4e3324551b 100644
--- a/spec/unit/controllers/runtime/stagings_controller_spec.rb
+++ b/spec/unit/controllers/runtime/stagings_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 ## NOTICE: Prefer request specs over controller specs as per ADR #0003 ##
 
@@ -164,7 +164,7 @@ module VCAP::CloudController
     end
   end
 
-  RSpec.describe StagingsController do
+  RSpec.describe StagingsController, :fog_isolation do
     let(:timeout_in_seconds) { 120 }
     let(:cc_addr) { '1.2.3.4' }
     let(:cc_port) { 5678 }
diff --git a/spec/unit/decorators/embed_process_instances_decorator_spec.rb b/spec/unit/decorators/embed_process_instances_decorator_spec.rb
index 3bd52c72562..d6ed356ae86 100644
--- a/spec/unit/decorators/embed_process_instances_decorator_spec.rb
+++ b/spec/unit/decorators/embed_process_instances_decorator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'db_spec_helper'
+require 'decorators/embed_process_instances_decorator'
 
 module VCAP::CloudController
   RSpec.describe EmbedProcessInstancesDecorator do
diff --git a/spec/unit/decorators/field_service_offering_service_broker_decorator_spec.rb b/spec/unit/decorators/field_service_offering_service_broker_decorator_spec.rb
index ce4097c64d7..92fc28ea62e 100644
--- a/spec/unit/decorators/field_service_offering_service_broker_decorator_spec.rb
+++ b/spec/unit/decorators/field_service_offering_service_broker_decorator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'decorators/field_service_offering_service_broker_decorator'
 require 'field_decorator_spec_shared_examples'
 
diff --git a/spec/unit/decorators/field_service_plan_service_broker_decorator_spec.rb b/spec/unit/decorators/field_service_plan_service_broker_decorator_spec.rb
index 79e1ea060b8..bd97deb66fc 100644
--- a/spec/unit/decorators/field_service_plan_service_broker_decorator_spec.rb
+++ b/spec/unit/decorators/field_service_plan_service_broker_decorator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'decorators/field_service_plan_service_broker_decorator'
 require 'field_decorator_spec_shared_examples'
 
diff --git a/spec/unit/fetchers/app_fetcher_spec.rb b/spec/unit/fetchers/app_fetcher_spec.rb
index 1f7ca122e18..fde7568969b 100644
--- a/spec/unit/fetchers/app_fetcher_spec.rb
+++ b/spec/unit/fetchers/app_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/app_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/assign_current_droplet_fetcher_spec.rb b/spec/unit/fetchers/assign_current_droplet_fetcher_spec.rb
index 692d1514e03..a8fc16cbced 100644
--- a/spec/unit/fetchers/assign_current_droplet_fetcher_spec.rb
+++ b/spec/unit/fetchers/assign_current_droplet_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/assign_current_droplet_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/base_list_fetcher_spec.rb b/spec/unit/fetchers/base_list_fetcher_spec.rb
index ef5a44dd6e4..982416eeb81 100644
--- a/spec/unit/fetchers/base_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/base_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/events_list_message'
 require 'fetchers/event_list_fetcher'
 
diff --git a/spec/unit/fetchers/build_list_fetcher_spec.rb b/spec/unit/fetchers/build_list_fetcher_spec.rb
index 8561b222d1e..641abb3d1f4 100644
--- a/spec/unit/fetchers/build_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/build_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/builds_list_message'
 require 'fetchers/build_list_fetcher'
 
diff --git a/spec/unit/fetchers/droplet_fetcher_spec.rb b/spec/unit/fetchers/droplet_fetcher_spec.rb
index a53478e3ee3..7f0c419720c 100644
--- a/spec/unit/fetchers/droplet_fetcher_spec.rb
+++ b/spec/unit/fetchers/droplet_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/droplet_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/event_list_fetcher_spec.rb b/spec/unit/fetchers/event_list_fetcher_spec.rb
index c599ae4c1ff..08e41c2ec5d 100644
--- a/spec/unit/fetchers/event_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/event_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/events_list_message'
 require 'fetchers/event_list_fetcher'
 
diff --git a/spec/unit/fetchers/organization_quota_list_fetcher_spec.rb b/spec/unit/fetchers/organization_quota_list_fetcher_spec.rb
index 903b9b35ab2..42283f07c29 100644
--- a/spec/unit/fetchers/organization_quota_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/organization_quota_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/organization_quota_list_fetcher'
 require 'messages/organization_quotas_list_message'
 
diff --git a/spec/unit/fetchers/organization_user_roles_fetcher_spec.rb b/spec/unit/fetchers/organization_user_roles_fetcher_spec.rb
index 246bf770d10..6291c13c455 100644
--- a/spec/unit/fetchers/organization_user_roles_fetcher_spec.rb
+++ b/spec/unit/fetchers/organization_user_roles_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/organization_user_roles_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/package_fetcher_spec.rb b/spec/unit/fetchers/package_fetcher_spec.rb
index 7ce1dcdc5dc..a2306745601 100644
--- a/spec/unit/fetchers/package_fetcher_spec.rb
+++ b/spec/unit/fetchers/package_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/package_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/process_fetcher_spec.rb b/spec/unit/fetchers/process_fetcher_spec.rb
index a56751bb232..8eb0f43435a 100644
--- a/spec/unit/fetchers/process_fetcher_spec.rb
+++ b/spec/unit/fetchers/process_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/process_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/route_destinations_list_fetcher_spec.rb b/spec/unit/fetchers/route_destinations_list_fetcher_spec.rb
index 986f791d669..63f3658024d 100644
--- a/spec/unit/fetchers/route_destinations_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/route_destinations_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/route_destinations_list_fetcher'
 require 'messages/route_destinations_list_message'
 
diff --git a/spec/unit/fetchers/service_binding_list_fetcher_spec.rb b/spec/unit/fetchers/service_binding_list_fetcher_spec.rb
index 228e1c2e859..4a16b1e2412 100644
--- a/spec/unit/fetchers/service_binding_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/service_binding_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/service_binding_list_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/fetchers/space_quota_list_fetcher_spec.rb b/spec/unit/fetchers/space_quota_list_fetcher_spec.rb
index 37bc07277e9..7485274d622 100644
--- a/spec/unit/fetchers/space_quota_list_fetcher_spec.rb
+++ b/spec/unit/fetchers/space_quota_list_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/space_quota_list_fetcher'
 require 'messages/space_quotas_list_message'
 
diff --git a/spec/unit/jobs/runtime/blobstore_delete_spec.rb b/spec/unit/jobs/runtime/blobstore_delete_spec.rb
index df7e32fd2fa..8e53c2ffdbf 100644
--- a/spec/unit/jobs/runtime/blobstore_delete_spec.rb
+++ b/spec/unit/jobs/runtime/blobstore_delete_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::Runtime
-    RSpec.describe BlobstoreDelete, job_context: :worker do
+    RSpec.describe BlobstoreDelete, :fog_isolation, job_context: :worker do
       let(:key) { 'key' }
       subject(:job) do
         BlobstoreDelete.new(key, :droplet_blobstore)
diff --git a/spec/unit/jobs/runtime/blobstore_upload_spec.rb b/spec/unit/jobs/runtime/blobstore_upload_spec.rb
index 1e4514b2cd5..73c991f5711 100644
--- a/spec/unit/jobs/runtime/blobstore_upload_spec.rb
+++ b/spec/unit/jobs/runtime/blobstore_upload_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::Runtime
-    RSpec.describe BlobstoreUpload, job_context: :worker do
+    RSpec.describe BlobstoreUpload, :fog_isolation, job_context: :worker do
       let(:local_file) { Tempfile.new('tmpfile') }
       let(:blobstore_key) { 'key' }
       let(:blobstore_name) { :droplet_blobstore }
diff --git a/spec/unit/jobs/runtime/buildpack_cache_cleanup_spec.rb b/spec/unit/jobs/runtime/buildpack_cache_cleanup_spec.rb
index e4c75cb56ef..27e98e62725 100644
--- a/spec/unit/jobs/runtime/buildpack_cache_cleanup_spec.rb
+++ b/spec/unit/jobs/runtime/buildpack_cache_cleanup_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::Runtime
-    RSpec.describe BuildpackCacheCleanup, job_context: :worker do
+    RSpec.describe BuildpackCacheCleanup, :fog_isolation, job_context: :worker do
       let(:cc_addr) { '1.2.3.4' }
       let(:cc_port) { 5678 }
       let(:orphan_key) { 'orphan-key' }
diff --git a/spec/unit/jobs/v3/buildpack_cache_cleanup_spec.rb b/spec/unit/jobs/v3/buildpack_cache_cleanup_spec.rb
index eabeb77fdc2..6e82fb763a3 100644
--- a/spec/unit/jobs/v3/buildpack_cache_cleanup_spec.rb
+++ b/spec/unit/jobs/v3/buildpack_cache_cleanup_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe BuildpackCacheCleanup, job_context: :worker do
+    RSpec.describe BuildpackCacheCleanup, :fog_isolation, job_context: :worker do
       let(:cc_addr) { '1.2.3.4' }
       let(:cc_port) { 5678 }
       let(:orphan_key) { 'orphan-key' }
diff --git a/spec/unit/jobs/v3/buildpack_cache_delete_spec.rb b/spec/unit/jobs/v3/buildpack_cache_delete_spec.rb
index 3b51081a117..ca66770d965 100644
--- a/spec/unit/jobs/v3/buildpack_cache_delete_spec.rb
+++ b/spec/unit/jobs/v3/buildpack_cache_delete_spec.rb
@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'jobs/v3/buildpack_cache_delete'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe BuildpackCacheDelete, job_context: :worker do
+    RSpec.describe BuildpackCacheDelete, :fog_isolation, job_context: :worker do
       let(:app_guid) { 'some-guid' }
       let(:local_dir) { Dir.mktmpdir }
       let!(:blobstore) do
diff --git a/spec/unit/jobs/v3/buildpack_cache_upload_spec.rb b/spec/unit/jobs/v3/buildpack_cache_upload_spec.rb
index 722daec0ea1..e724c545daa 100644
--- a/spec/unit/jobs/v3/buildpack_cache_upload_spec.rb
+++ b/spec/unit/jobs/v3/buildpack_cache_upload_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe BuildpackCacheUpload, job_context: :api do
+    RSpec.describe BuildpackCacheUpload, :fog_isolation, job_context: :api do
       subject(:job) { BuildpackCacheUpload.new(local_path: local_file.path, app_guid: app.guid, stack_name: 'some-stack') }
 
       let(:app) { AppModel.make }
diff --git a/spec/unit/jobs/v3/droplet_bits_copier_spec.rb b/spec/unit/jobs/v3/droplet_bits_copier_spec.rb
index f4e4ec0616b..ff0847c14ef 100644
--- a/spec/unit/jobs/v3/droplet_bits_copier_spec.rb
+++ b/spec/unit/jobs/v3/droplet_bits_copier_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe DropletBitsCopier do
+    RSpec.describe DropletBitsCopier, :fog_isolation do
       subject(:job) { DropletBitsCopier.new(source_droplet.guid, destination_droplet.guid) }
 
       let(:droplet_bits_path) { File.expand_path('../../../fixtures/good.zip', File.dirname(__FILE__)) }
diff --git a/spec/unit/jobs/v3/droplet_upload_spec.rb b/spec/unit/jobs/v3/droplet_upload_spec.rb
index 08f30bde7b3..ae323e81a18 100644
--- a/spec/unit/jobs/v3/droplet_upload_spec.rb
+++ b/spec/unit/jobs/v3/droplet_upload_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe DropletUpload, job_context: :api do
+    RSpec.describe DropletUpload, :fog_isolation, job_context: :api do
       let(:droplet) { DropletModel.make(state: 'STAGING', droplet_hash: nil, sha256_checksum: nil, app: nil) }
       let(:file_content) { 'some_file_content' }
       let(:local_file) do
diff --git a/spec/unit/jobs/v3/package_bits_copier_spec.rb b/spec/unit/jobs/v3/package_bits_copier_spec.rb
index 46ff1d76dc1..f81419e8057 100644
--- a/spec/unit/jobs/v3/package_bits_copier_spec.rb
+++ b/spec/unit/jobs/v3/package_bits_copier_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
   module Jobs::V3
-    RSpec.describe PackageBitsCopier, job_context: :worker do
+    RSpec.describe PackageBitsCopier, :fog_isolation, job_context: :worker do
       subject(:job) { PackageBitsCopier.new(source_package.guid, destination_package.guid) }
 
       let(:package_bits_path) { File.expand_path('../../../fixtures/good.zip', File.dirname(__FILE__)) }
diff --git a/spec/unit/lib/cloud_controller/adjective_noun_generator_spec.rb b/spec/unit/lib/cloud_controller/adjective_noun_generator_spec.rb
index 5194bea091f..502cdb9f1f8 100644
--- a/spec/unit/lib/cloud_controller/adjective_noun_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/adjective_noun_generator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/adjective_noun_generator'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/app_manifest/byte_converter_spec.rb b/spec/unit/lib/cloud_controller/app_manifest/byte_converter_spec.rb
index b4743e27ffa..ee9c10cb1a1 100644
--- a/spec/unit/lib/cloud_controller/app_manifest/byte_converter_spec.rb
+++ b/spec/unit/lib/cloud_controller/app_manifest/byte_converter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/app_manifest/byte_converter'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb b/spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb
index 6fa32f816aa..7958a29c621 100644
--- a/spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb
+++ b/spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/app_manifest/manifest_route'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/blob_sender/default_blob_sender_spec.rb b/spec/unit/lib/cloud_controller/blob_sender/default_blob_sender_spec.rb
index b1e20be27f3..51e9d63e355 100644
--- a/spec/unit/lib/cloud_controller/blob_sender/default_blob_sender_spec.rb
+++ b/spec/unit/lib/cloud_controller/blob_sender/default_blob_sender_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'steno/steno'
 require 'cloud_controller/blob_sender/default_blob_sender'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/blob_key_generator_spec.rb b/spec/unit/lib/cloud_controller/blobstore/blob_key_generator_spec.rb
index 462d8d69e74..d6338ebd88d 100644
--- a/spec/unit/lib/cloud_controller/blobstore/blob_key_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/blob_key_generator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob_key_generator'
 
 module CloudController
   module Blobstore
diff --git a/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb b/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb
index bd0c1685a23..056dbab9390 100644
--- a/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module CloudController
   module Blobstore
-    RSpec.describe ClientProvider do
+    RSpec.describe ClientProvider, :fog_isolation do
       let(:options) { { blobstore_type: } }
 
       context 'when no type is requested' do
diff --git a/spec/unit/lib/cloud_controller/blobstore/client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/client_spec.rb
index a5145ec2e2e..79f58ed2c42 100644
--- a/spec/unit/lib/cloud_controller/blobstore/client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/client_spec.rb
@@ -1,5 +1,10 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'find'
+require 'tempfile'
+require 'securerandom'
+require 'cloud_controller/blobstore/client'
 require 'cloud_controller/blobstore/null_client'
+require 'cloud_controller/blobstore/blob'
 require_relative 'client_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/error_handling_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/error_handling_client_spec.rb
index 760306a8457..53eeb35e970 100644
--- a/spec/unit/lib/cloud_controller/blobstore/error_handling_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/error_handling_client_spec.rb
@@ -1,11 +1,11 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require_relative 'client_shared'
 require 'cloud_controller/blobstore/error_handling_client'
 require 'cloud_controller/blobstore/null_client'
 
 module CloudController
   module Blobstore
-    RSpec.describe ErrorHandlingClient do
+    RSpec.describe ErrorHandlingClient, :fog_isolation do
       subject(:client) { ErrorHandlingClient.new(wrapped_client) }
       let(:wrapped_client) { Blobstore::NullClient.new }
       let(:logger) { instance_double(Steno::Logger, error: nil) }
diff --git a/spec/unit/lib/cloud_controller/blobstore/fingerprints_collection_spec.rb b/spec/unit/lib/cloud_controller/blobstore/fingerprints_collection_spec.rb
index 8659399a1d7..0aa403b0951 100644
--- a/spec/unit/lib/cloud_controller/blobstore/fingerprints_collection_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/fingerprints_collection_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/errors/api_error'
+require 'cloud_controller/file_path_checker'
 require 'cloud_controller/blobstore/fingerprints_collection'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/fog/fog_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/fog/fog_blob_spec.rb
index 34e75422d40..10014352141 100644
--- a/spec/unit/lib/cloud_controller/blobstore/fog/fog_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/fog/fog_blob_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'timecop'
+require 'cloud_controller/blobstore/blob'
+require 'cloud_controller/blobstore/fog/fog_blob'
 require_relative '../blob_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb
index 37139e9e555..3f858976c44 100644
--- a/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'webrick'
 require_relative '../client_shared'
 require 'fog/aws/models/storage/files'
@@ -6,7 +6,7 @@
 
 module CloudController
   module Blobstore
-    RSpec.describe FogClient do
+    RSpec.describe FogClient, :fog_isolation do
       let(:content) { 'Some Nonsense' }
       let(:sha_of_content) { Digester.new.digest(content) }
       let(:local_dir) { Dir.mktmpdir }
diff --git a/spec/unit/lib/cloud_controller/blobstore/local/local_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/local/local_blob_spec.rb
index 7eed651b681..691f86107f0 100644
--- a/spec/unit/lib/cloud_controller/blobstore/local/local_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/local/local_blob_spec.rb
@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'tempfile'
+require 'openssl'
+require 'fileutils'
+require 'cloud_controller/blobstore/local/local_blob'
 
 module CloudController
   module Blobstore
diff --git a/spec/unit/lib/cloud_controller/blobstore/local/local_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/local/local_client_spec.rb
index 07fbb139493..a64b7bd1fde 100644
--- a/spec/unit/lib/cloud_controller/blobstore/local/local_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/local/local_client_spec.rb
@@ -1,4 +1,13 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'find'
+require 'tempfile'
+require 'tmpdir'
+require 'fileutils'
+require 'securerandom'
+require 'steno/steno'
+require 'cloud_controller/blobstore/local/local_client'
+require 'cloud_controller/blobstore/local/local_blob'
+require 'cloud_controller/blobstore/errors'
 require_relative '../client_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/null_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/null_blob_spec.rb
index 6a31754bea3..91e65ebdf05 100644
--- a/spec/unit/lib/cloud_controller/blobstore/null_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/null_blob_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob'
 require 'cloud_controller/blobstore/null_blob'
 require_relative 'blob_shared'
 
diff --git a/spec/unit/lib/cloud_controller/blobstore/null_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/null_client_spec.rb
index 4179cdb926e..a6c86a77135 100644
--- a/spec/unit/lib/cloud_controller/blobstore/null_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/null_client_spec.rb
@@ -1,5 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'find'
+require 'tempfile'
+require 'securerandom'
 require 'cloud_controller/blobstore/null_client'
+require 'cloud_controller/blobstore/blob'
 require_relative 'client_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/retryable_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/retryable_blob_spec.rb
index cf52a0b8e8a..b4d7303e1d8 100644
--- a/spec/unit/lib/cloud_controller/blobstore/retryable_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/retryable_blob_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'steno/steno'
+require 'cloud_controller/blobstore/blob'
 require 'cloud_controller/blobstore/retryable_blob'
 require 'cloud_controller/blobstore/null_blob'
 require_relative 'blob_shared'
diff --git a/spec/unit/lib/cloud_controller/blobstore/retryable_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/retryable_client_spec.rb
index b7e3de44b00..ebf430ca567 100644
--- a/spec/unit/lib/cloud_controller/blobstore/retryable_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/retryable_client_spec.rb
@@ -1,11 +1,11 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'cloud_controller/blobstore/retryable_client'
 require 'cloud_controller/blobstore/null_client'
 require_relative 'client_shared'
 
 module CloudController
   module Blobstore
-    RSpec.describe RetryableClient do
+    RSpec.describe RetryableClient, :fog_isolation do
       subject(:client) do
         RetryableClient.new(
           client: wrapped_client,
diff --git a/spec/unit/lib/cloud_controller/blobstore/safe_delete_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/safe_delete_client_spec.rb
index ae7cbe2b073..159117caf36 100644
--- a/spec/unit/lib/cloud_controller/blobstore/safe_delete_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/safe_delete_client_spec.rb
@@ -1,10 +1,10 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'cloud_controller/blobstore/null_client'
 require_relative 'client_shared'
 
 module CloudController
   module Blobstore
-    RSpec.describe SafeDeleteClient do
+    RSpec.describe SafeDeleteClient, :fog_isolation do
       subject(:client) { SafeDeleteClient.new(wrapped_client, root_dir) }
       let(:wrapped_client) { NullClient.new }
       let(:root_dir) { 'root-dir' }
diff --git a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_blob_spec.rb
index 1595f3caa7a..8f5084fc0cb 100644
--- a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_blob_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob'
+require 'cloud_controller/blobstore/storage_cli/storage_cli_blob'
+require 'cloud_controller/blobstore/errors'
 require_relative '../blob_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb
index ead5a6e64f8..1c88b282461 100644
--- a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb
@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'cloud_controller/blobstore/storage_cli/storage_cli_client'
 
 module CloudController
   module Blobstore
-    RSpec.describe StorageCliClient do
+    RSpec.describe StorageCliClient, :fog_isolation do
       describe 'client init' do
         # DEPRECATED: Legacy fog provider tests - remove after migration window
         # START LEGACY FOG SUPPORT TESTS
diff --git a/spec/unit/lib/cloud_controller/blobstore/url_generator/upload_url_generator_spec.rb b/spec/unit/lib/cloud_controller/blobstore/url_generator/upload_url_generator_spec.rb
index c6edcc5c79c..4e023c2bbec 100644
--- a/spec/unit/lib/cloud_controller/blobstore/url_generator/upload_url_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/url_generator/upload_url_generator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'securerandom'
 require 'cloud_controller/blobstore/url_generator/upload_url_generator'
 
 module CloudController
@@ -32,7 +33,7 @@ module Blobstore
           end
 
           it 'gives out the mTLS url for droplet upload' do
-            droplet_guid = Sham.guid
+            droplet_guid = SecureRandom.uuid
             uri          = URI.parse(url_generator.droplet_upload_url(droplet_guid))
             expect(uri.scheme).to eql 'https'
             expect(uri.host).to eql blobstore_host
@@ -41,8 +42,8 @@ module Blobstore
           end
 
           it 'gives out the mTLS url for buildpack_cache upload' do
-            app_guid = Sham.guid
-            stack    = Sham.name
+            app_guid = SecureRandom.uuid
+            stack    = "stack-#{SecureRandom.hex(4)}"
             uri      = URI.parse(url_generator.buildpack_cache_upload_url(app_guid, stack))
             expect(uri.scheme).to eql 'https'
             expect(uri.host).to eql blobstore_host
diff --git a/spec/unit/lib/cloud_controller/blobstore/webdav/dav_blob_spec.rb b/spec/unit/lib/cloud_controller/blobstore/webdav/dav_blob_spec.rb
index 3047bfaf4af..fcd8ad73b77 100644
--- a/spec/unit/lib/cloud_controller/blobstore/webdav/dav_blob_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/webdav/dav_blob_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'httpclient'
+require 'timecop'
+require 'cloud_controller/blobstore/blob'
+require 'cloud_controller/blobstore/webdav/dav_blob'
+require 'cloud_controller/blobstore/webdav/nginx_secure_link_signer'
 require_relative '../blob_shared'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb
index f4caad00c4b..8edb8ada2a0 100644
--- a/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb
@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require_relative '../client_shared'
 
 module CloudController
   module Blobstore
-    RSpec.describe DavClient do
+    RSpec.describe DavClient, :fog_isolation do
       subject(:client) do
         DavClient.new(
           directory_key: directory_key,
diff --git a/spec/unit/lib/cloud_controller/blobstore/webdav/nginx_secure_link_signer_spec.rb b/spec/unit/lib/cloud_controller/blobstore/webdav/nginx_secure_link_signer_spec.rb
index f2cf060e3d7..dd2164e9359 100644
--- a/spec/unit/lib/cloud_controller/blobstore/webdav/nginx_secure_link_signer_spec.rb
+++ b/spec/unit/lib/cloud_controller/blobstore/webdav/nginx_secure_link_signer_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'base64'
+require 'httpclient'
+require 'cloud_controller/blobstore/errors'
 require 'cloud_controller/blobstore/webdav/nginx_secure_link_signer'
 
 module CloudController
diff --git a/spec/unit/lib/cloud_controller/byte_quantity_spec.rb b/spec/unit/lib/cloud_controller/byte_quantity_spec.rb
index bf99ae01d33..0959fe60913 100644
--- a/spec/unit/lib/cloud_controller/byte_quantity_spec.rb
+++ b/spec/unit/lib/cloud_controller/byte_quantity_spec.rb
@@ -1,10 +1,10 @@
 # Derived from the palm_civet library
 # Copyright (c) 2013 Anand Gaitonde
+require 'cloud_controller/byte_quantity'
 # Licensed under the MIT License
 # https://github.com/goodmustache/palm_civet
 
-require 'spec_helper'
-require 'cloud_controller/byte_quantity'
+require 'lightweight_spec_helper'
 
 module VCAP::CloudController
   RSpec.describe ByteQuantity do
diff --git a/spec/unit/lib/cloud_controller/clock/distributed_scheduler_spec.rb b/spec/unit/lib/cloud_controller/clock/distributed_scheduler_spec.rb
index d5f759a5044..86442b26224 100644
--- a/spec/unit/lib/cloud_controller/clock/distributed_scheduler_spec.rb
+++ b/spec/unit/lib/cloud_controller/clock/distributed_scheduler_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'clockwork'
 require 'cloud_controller/clock/distributed_scheduler'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb b/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb
index 059c61a679f..264a7d64ff3 100644
--- a/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb
+++ b/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/database_parts_parser'
 
 RSpec.describe VCAP::CloudController::DatabasePartsParser do
diff --git a/spec/unit/lib/cloud_controller/database_uri_generator_spec.rb b/spec/unit/lib/cloud_controller/database_uri_generator_spec.rb
index c0ae0ae68e4..e783d3c8e2b 100644
--- a/spec/unit/lib/cloud_controller/database_uri_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/database_uri_generator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/database_uri_generator'
 
 RSpec.describe VCAP::CloudController::DatabaseUriGenerator do
   let(:service_uris) { ['postgres://username:password@host/db'] }
diff --git a/spec/unit/lib/cloud_controller/db_connection/finalizer_spec.rb b/spec/unit/lib/cloud_controller/db_connection/finalizer_spec.rb
index 1af916b1d00..156733cc209 100644
--- a/spec/unit/lib/cloud_controller/db_connection/finalizer_spec.rb
+++ b/spec/unit/lib/cloud_controller/db_connection/finalizer_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/finalizer'
 
 RSpec.describe VCAP::CloudController::DbConnection::Finalizer do
diff --git a/spec/unit/lib/cloud_controller/db_connection/mysql_options_factory_spec.rb b/spec/unit/lib/cloud_controller/db_connection/mysql_options_factory_spec.rb
index f7db69f8715..d45a1d275d3 100644
--- a/spec/unit/lib/cloud_controller/db_connection/mysql_options_factory_spec.rb
+++ b/spec/unit/lib/cloud_controller/db_connection/mysql_options_factory_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/mysql_options_factory'
 
 RSpec.describe VCAP::CloudController::DbConnection::MysqlOptionsFactory do
diff --git a/spec/unit/lib/cloud_controller/db_connection/options_factory_spec.rb b/spec/unit/lib/cloud_controller/db_connection/options_factory_spec.rb
index 699abce3fd4..1186abdd46c 100644
--- a/spec/unit/lib/cloud_controller/db_connection/options_factory_spec.rb
+++ b/spec/unit/lib/cloud_controller/db_connection/options_factory_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/options_factory'
 require 'cloud_controller/db_connection/mysql_options_factory'
 
diff --git a/spec/unit/lib/cloud_controller/db_connection/postgres_options_factory_spec.rb b/spec/unit/lib/cloud_controller/db_connection/postgres_options_factory_spec.rb
index 3e203be6391..0f2e4233694 100644
--- a/spec/unit/lib/cloud_controller/db_connection/postgres_options_factory_spec.rb
+++ b/spec/unit/lib/cloud_controller/db_connection/postgres_options_factory_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/postgres_options_factory'
 
 RSpec.describe VCAP::CloudController::DbConnection::PostgresOptionsFactory do
diff --git a/spec/unit/lib/cloud_controller/diego/bbs_task_client_spec.rb b/spec/unit/lib/cloud_controller/diego/bbs_task_client_spec.rb
index 38dbbaa37dc..0d055a1666f 100644
--- a/spec/unit/lib/cloud_controller/diego/bbs_task_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/bbs_task_client_spec.rb
@@ -1,14 +1,21 @@
-require 'spec_helper'
-require 'cloud_controller/diego/task_recipe_builder'
+require 'lightweight_spec_helper'
+require 'steno/steno'
+require 'cloud_controller/errors/api_error'
 require 'cloud_controller/diego/bbs_task_client'
 
+module VCAP::CloudController
+  module Diego
+    class TaskRecipeBuilder; end unless defined?(TaskRecipeBuilder)
+  end
+end
+
 module VCAP::CloudController::Diego
   RSpec.describe BbsTaskClient do
-    let(:task) { instance_double(VCAP::CloudController::TaskModel, guid: 'task-guid') }
-    let(:config) { instance_double(VCAP::CloudController::Config) }
+    let(:task) { double(:task_model, guid: 'task-guid') }
+    let(:config) { double(:config) }
     let(:domain) { 'foobar-domain' }
-    let(:bbs_client) { instance_double(::Diego::Client) }
-    let(:recipe_builder) { instance_double(TaskRecipeBuilder) }
+    let(:bbs_client) { double(:bbs_client) }
+    let(:recipe_builder) { double(:task_recipe_builder) }
 
     subject(:client) { BbsTaskClient.new(config, bbs_client) }
 
diff --git a/spec/unit/lib/cloud_controller/diego/buildpack/lifecycle_data_spec.rb b/spec/unit/lib/cloud_controller/diego/buildpack/lifecycle_data_spec.rb
index c534c0b1f48..f1b170dba67 100644
--- a/spec/unit/lib/cloud_controller/diego/buildpack/lifecycle_data_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/buildpack/lifecycle_data_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'membrane'
 require 'cloud_controller/diego/buildpack/lifecycle_data'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/diego/cnb/lifecycle_data_spec.rb b/spec/unit/lib/cloud_controller/diego/cnb/lifecycle_data_spec.rb
index 3966880741d..e4b60fca1d8 100644
--- a/spec/unit/lib/cloud_controller/diego/cnb/lifecycle_data_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/cnb/lifecycle_data_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
-require 'cloud_controller/diego/buildpack/lifecycle_data'
+require 'lightweight_spec_helper'
+require 'membrane'
+require 'cloud_controller/diego/cnb/lifecycle_data'
 
 module VCAP::CloudController
   module Diego
diff --git a/spec/unit/lib/cloud_controller/diego/desire_app_handler_spec.rb b/spec/unit/lib/cloud_controller/diego/desire_app_handler_spec.rb
index 23ca41a7330..a90c5f922f6 100644
--- a/spec/unit/lib/cloud_controller/diego/desire_app_handler_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/desire_app_handler_spec.rb
@@ -1,14 +1,15 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/diego/desire_app_handler'
 
 module VCAP::CloudController
   module Diego
     RSpec.describe DesireAppHandler do
       describe '.create_or_update_app' do
-        let(:client) { instance_double(BbsAppsClient) }
+        let(:client) { double(:bbs_apps_client) }
         let(:desired_lrp) { double(:desired_lrp) }
         let(:process_guid) { 'the-process-guid' }
         let(:get_app_response) { nil }
-        let(:process) { ProcessModel.new }
+        let(:process) { double(:process) }
 
         before do
           allow(client).to receive(:get_app).with(process).and_return(get_app_response)
diff --git a/spec/unit/lib/cloud_controller/diego/docker/desired_lrp_builder_spec.rb b/spec/unit/lib/cloud_controller/diego/docker/desired_lrp_builder_spec.rb
index b9ca976c848..d1bc02c606b 100644
--- a/spec/unit/lib/cloud_controller/diego/docker/desired_lrp_builder_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/docker/desired_lrp_builder_spec.rb
@@ -1,4 +1,13 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'diego/bbs/bbs'
+require 'cloud_controller/errors/api_error'
+require 'cloud_controller/diego/constants'
+require 'cloud_controller/diego/lifecycle_bundle_uri_generator'
+require 'cloud_controller/diego/normal_env_hash_to_diego_env_array_philosopher'
+require 'cloud_controller/diego/docker/desired_lrp_builder'
+require 'cloud_controller/diego/docker/docker_uri_converter'
+require 'cloud_controller/diego/bbs_environment_builder'
 
 module VCAP::CloudController
   module Diego
@@ -16,14 +25,12 @@ module Docker
           }
         end
         let(:config) do
-          Config.new({
-                       diego: {
-                         lifecycle_bundles: {
-                           docker: 'http://docker.example.com/path/to/lifecycle.tgz'
-                         },
-                         enable_declarative_asset_downloads: enable_declarative_asset_downloads
-                       }
-                     })
+          StubConfig.new(diego: {
+                           lifecycle_bundles: {
+                             docker: 'http://docker.example.com/path/to/lifecycle.tgz'
+                           },
+                           enable_declarative_asset_downloads: enable_declarative_asset_downloads
+                         })
         end
         let(:ports) { [] }
         let(:additional_env_vars) { [] }
diff --git a/spec/unit/lib/cloud_controller/diego/docker/docker_uri_converter_spec.rb b/spec/unit/lib/cloud_controller/diego/docker/docker_uri_converter_spec.rb
index 9b963dc1a46..c07b07f38d2 100644
--- a/spec/unit/lib/cloud_controller/diego/docker/docker_uri_converter_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/docker/docker_uri_converter_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'addressable/uri'
 require 'cloud_controller/diego/docker/docker_uri_converter'
 require 'utils/uri_utils'
 
diff --git a/spec/unit/lib/cloud_controller/diego/docker/lifecycle_data_spec.rb b/spec/unit/lib/cloud_controller/diego/docker/lifecycle_data_spec.rb
index 8a0c9d9afe0..1df8a574ae1 100644
--- a/spec/unit/lib/cloud_controller/diego/docker/lifecycle_data_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/docker/lifecycle_data_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'membrane'
 require 'cloud_controller/diego/docker/lifecycle_data'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/diego/docker/staging_action_builder_spec.rb b/spec/unit/lib/cloud_controller/diego/docker/staging_action_builder_spec.rb
index 67f8bc56bf5..d6127671d68 100644
--- a/spec/unit/lib/cloud_controller/diego/docker/staging_action_builder_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/docker/staging_action_builder_spec.rb
@@ -1,4 +1,12 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'diego/bbs/bbs'
+require 'diego/action_builder'
+require 'cloud_controller/diego/constants'
+require 'cloud_controller/diego/lifecycle_bundle_uri_generator'
+require 'cloud_controller/diego/staging_details'
+require 'cloud_controller/diego/normal_env_hash_to_diego_env_array_philosopher'
+require 'cloud_controller/diego/bbs_environment_builder'
+require 'cloud_controller/diego/docker/staging_action_builder'
 
 module VCAP::CloudController
   module Diego
@@ -7,23 +15,28 @@ module Docker
         subject(:builder) { StagingActionBuilder.new(config, staging_details) }
 
         let(:config) do
-          Config.new({
-                       diego: {
-                         docker_staging_stack: 'docker-staging-stack',
-                         lifecycle_bundles: {
-                           docker: 'the-docker-bundle'
-                         },
-                         enable_declarative_asset_downloads: enable_declarative_asset_downloads,
-                         insecure_docker_registry_list: []
-                       },
-                       staging: {
-                         minimum_staging_file_descriptor_limit: 4
-                       }
-                     })
+          c = StubConfig.new(diego: {
+                               docker_staging_stack: 'docker-staging-stack',
+                               lifecycle_bundles: {
+                                 docker: 'the-docker-bundle'
+                               },
+                               enable_declarative_asset_downloads: enable_declarative_asset_downloads,
+                               insecure_docker_registry_list: insecure_docker_registry_list
+                             },
+                             staging: {
+                               minimum_staging_file_descriptor_limit: 4
+                             })
+          c
         end
+        let(:insecure_docker_registry_list) { [] }
+        let(:package) do
+          double(:package, image: 'the-docker-image', docker_username: docker_username, docker_password: docker_password)
+        end
+        let(:docker_username) { nil }
+        let(:docker_password) { nil }
         let(:staging_details) do
           StagingDetails.new.tap do |details|
-            details.package = PackageModel.new(docker_image: 'the-docker-image')
+            details.package = package
             details.environment_variables = env
           end
         end
@@ -54,9 +67,7 @@ module Docker
           end
 
           context 'when there are insecure docker registries' do
-            before do
-              config.set(:diego, config.get(:diego).deep_merge(insecure_docker_registry_list: %w[registry-1 registry-2]))
-            end
+            let(:insecure_docker_registry_list) { %w[registry-1 registry-2] }
 
             it 'includes them in the run action args' do
               result = builder.action
@@ -67,16 +78,8 @@ module Docker
           end
 
           context 'where there are docker credentials' do
-            let(:staging_details) do
-              StagingDetails.new.tap do |details|
-                details.package = PackageModel.new(
-                  docker_image: 'the-docker-image',
-                  docker_username: 'dockerusername',
-                  docker_password: 'dockerpassword'
-                )
-                details.environment_variables = env
-              end
-            end
+            let(:docker_username) { 'dockerusername' }
+            let(:docker_password) { 'dockerpassword' }
 
             it 'includes them in the run action args' do
               result = builder.action
diff --git a/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb b/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb
index b9764de77e9..8cfe984d7ac 100644
--- a/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/diego/droplet_url_generator'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/diego/failure_reason_sanitizer_spec.rb b/spec/unit/lib/cloud_controller/diego/failure_reason_sanitizer_spec.rb
index a97c5ee6c4b..5e26a0999ba 100644
--- a/spec/unit/lib/cloud_controller/diego/failure_reason_sanitizer_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/failure_reason_sanitizer_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/diego/failure_reason_sanitizer'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/diego/lifecycle_bundle_uri_generator_spec.rb b/spec/unit/lib/cloud_controller/diego/lifecycle_bundle_uri_generator_spec.rb
index e585ccb0935..09268c063c2 100644
--- a/spec/unit/lib/cloud_controller/diego/lifecycle_bundle_uri_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/lifecycle_bundle_uri_generator_spec.rb
@@ -1,10 +1,11 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/diego/lifecycle_bundle_uri_generator'
 
 module VCAP::CloudController
   module Diego
     RSpec.describe LifecycleBundleUriGenerator do
       before do
-        TestConfig.override(diego: { file_server_url: 'https://file-server.example.com:1234' })
+        StubConfig.prepare(self, diego: { file_server_url: 'https://file-server.example.com:1234' })
       end
 
       it 'creates a file server url for a bundle path' do
diff --git a/spec/unit/lib/cloud_controller/diego/lifecycle_protocol_spec.rb b/spec/unit/lib/cloud_controller/diego/lifecycle_protocol_spec.rb
index bd73cee5664..ed9628333a1 100644
--- a/spec/unit/lib/cloud_controller/diego/lifecycle_protocol_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/lifecycle_protocol_spec.rb
@@ -1,9 +1,24 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/diego/lifecycles/lifecycles'
 require 'cloud_controller/diego/lifecycle_protocol'
+require 'cloud_controller/diego/buildpack/lifecycle_protocol'
 require 'cloud_controller/diego/cnb/lifecycle_protocol'
+require 'cloud_controller/diego/docker/lifecycle_protocol'
+
+module CloudController
+  class DependencyLocator
+  end
+end unless defined?(::CloudController::DependencyLocator)
 
 module VCAP::CloudController::Diego
   RSpec.describe LifecycleProtocol do
+    before do
+      dependency_locator = double(:dependency_locator,
+                                  blobstore_url_generator: double(:blobstore_url_generator),
+                                  droplet_url_generator: double(:droplet_url_generator))
+      allow(::CloudController::DependencyLocator).to receive(:instance).and_return(dependency_locator)
+    end
+
     describe '.protocol_for_type' do
       subject(:protocol) { LifecycleProtocol.protocol_for_type(type) }
 
diff --git a/spec/unit/lib/cloud_controller/diego/ssh_key_spec.rb b/spec/unit/lib/cloud_controller/diego/ssh_key_spec.rb
index bf8b212332a..aca3bfdc5e7 100644
--- a/spec/unit/lib/cloud_controller/diego/ssh_key_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/ssh_key_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/diego/ssh_key'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/diego/staging_action_builder_spec.rb b/spec/unit/lib/cloud_controller/diego/staging_action_builder_spec.rb
index 737105ab317..8806d665c49 100644
--- a/spec/unit/lib/cloud_controller/diego/staging_action_builder_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/staging_action_builder_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/diego/staging_action_builder'
 
 module VCAP::CloudController
@@ -6,7 +6,11 @@ module Diego
     RSpec.describe StagingActionBuilder do
       subject(:builder) { described_class.new(config, nil, nil, nil, nil, nil, nil) }
 
-      let(:config) { Config.new({ staging: { legacy_md5_buildpack_paths_enabled: } }) }
+      let(:config) { instance_double(VCAP::CloudController::Config) }
+
+      before do
+        allow(config).to receive(:get).with(:staging, :legacy_md5_buildpack_paths_enabled).and_return(legacy_md5_buildpack_paths_enabled)
+      end
 
       describe '#buildpack_path' do
         context 'when legacy_md5_buildpack_paths_enabled is false' do
diff --git a/spec/unit/lib/cloud_controller/diego/task_cpu_weight_calculator_spec.rb b/spec/unit/lib/cloud_controller/diego/task_cpu_weight_calculator_spec.rb
index 9e6aecf8640..ef33e9ed588 100644
--- a/spec/unit/lib/cloud_controller/diego/task_cpu_weight_calculator_spec.rb
+++ b/spec/unit/lib/cloud_controller/diego/task_cpu_weight_calculator_spec.rb
@@ -1,10 +1,14 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/diego/task_cpu_weight_calculator'
 
 module VCAP::CloudController
   module Diego
     RSpec.describe TaskCpuWeightCalculator do
       describe '#calculate with default values' do
+        before do
+          StubConfig.prepare(self, cpu_weight_min_memory: 128, cpu_weight_max_memory: 8192)
+        end
+
         let(:calculator) { TaskCpuWeightCalculator.new(memory_in_mb: memory) }
         let(:min_cpu_proxy) { VCAP::CloudController::Config.config.get(:cpu_weight_min_memory) }
         let(:max_cpu_proxy) { VCAP::CloudController::Config.config.get(:cpu_weight_max_memory) }
@@ -38,7 +42,7 @@ module Diego
 
       describe '#calculate with cpu_weight_max_memory=16384' do
         before do
-          TestConfig.override(cpu_weight_max_memory: 16_384)
+          StubConfig.prepare(self, cpu_weight_min_memory: 128, cpu_weight_max_memory: 16_384)
         end
 
         let(:calculator) { TaskCpuWeightCalculator.new(memory_in_mb: memory) }
diff --git a/spec/unit/lib/cloud_controller/file_path_checker_spec.rb b/spec/unit/lib/cloud_controller/file_path_checker_spec.rb
index d4f3e31a42d..2f76731d38a 100644
--- a/spec/unit/lib/cloud_controller/file_path_checker_spec.rb
+++ b/spec/unit/lib/cloud_controller/file_path_checker_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 
+require 'cloud_controller/file_path_checker'
 module VCAP
   module CloudController
     RSpec.describe FilePathChecker do
diff --git a/spec/unit/lib/cloud_controller/metrics/request_metrics_spec.rb b/spec/unit/lib/cloud_controller/metrics/request_metrics_spec.rb
index 3266e2f34f4..cf7fca34819 100644
--- a/spec/unit/lib/cloud_controller/metrics/request_metrics_spec.rb
+++ b/spec/unit/lib/cloud_controller/metrics/request_metrics_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/metrics/request_metrics'
 
 module VCAP::CloudController::Metrics
diff --git a/spec/unit/lib/cloud_controller/packager/local_bits_packer_spec.rb b/spec/unit/lib/cloud_controller/packager/local_bits_packer_spec.rb
index 1b0846a6e77..ffbd0baa065 100644
--- a/spec/unit/lib/cloud_controller/packager/local_bits_packer_spec.rb
+++ b/spec/unit/lib/cloud_controller/packager/local_bits_packer_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 require 'cloud_controller/packager/local_bits_packer'
 
 module CloudController::Packager
-  RSpec.describe LocalBitsPacker do
+  RSpec.describe LocalBitsPacker, :fog_isolation do
     subject(:packer) { LocalBitsPacker.new }
 
     let(:uploaded_files_path) { File.join(local_tmp_dir, 'good.zip') }
diff --git a/spec/unit/lib/cloud_controller/paging/pagination_options_spec.rb b/spec/unit/lib/cloud_controller/paging/pagination_options_spec.rb
index a122662c729..5ac3363ada2 100644
--- a/spec/unit/lib/cloud_controller/paging/pagination_options_spec.rb
+++ b/spec/unit/lib/cloud_controller/paging/pagination_options_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/paging/pagination_options'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/random_route_generator_spec.rb b/spec/unit/lib/cloud_controller/random_route_generator_spec.rb
index a1c52e75791..8c0bb910282 100644
--- a/spec/unit/lib/cloud_controller/random_route_generator_spec.rb
+++ b/spec/unit/lib/cloud_controller/random_route_generator_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 
+require 'cloud_controller/random_route_generator'
 module VCAP::CloudController
   RSpec.describe RandomRouteGenerator do
     let(:generator) { RandomRouteGenerator.new }
diff --git a/spec/unit/lib/cloud_controller/resource_pool_spec.rb b/spec/unit/lib/cloud_controller/resource_pool_spec.rb
index fab2ad6c253..1711ae48360 100644
--- a/spec/unit/lib/cloud_controller/resource_pool_spec.rb
+++ b/spec/unit/lib/cloud_controller/resource_pool_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
-  RSpec.describe ResourcePool do
+  RSpec.describe ResourcePool, :fog_isolation do
     include_context 'resource pool'
 
     describe '#match_resources' do
diff --git a/spec/unit/lib/cloud_controller/routing_api/disabled_routing_api_client_spec.rb b/spec/unit/lib/cloud_controller/routing_api/disabled_routing_api_client_spec.rb
index 111653c379d..32168346f6f 100644
--- a/spec/unit/lib/cloud_controller/routing_api/disabled_routing_api_client_spec.rb
+++ b/spec/unit/lib/cloud_controller/routing_api/disabled_routing_api_client_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/routing_api/disabled_routing_api_client'
 
 module VCAP::CloudController::RoutingApi
   RSpec.describe DisabledClient do
diff --git a/spec/unit/lib/cloud_controller/routing_api/router_group_spec.rb b/spec/unit/lib/cloud_controller/routing_api/router_group_spec.rb
index 6df136e4aad..eca14c11432 100644
--- a/spec/unit/lib/cloud_controller/routing_api/router_group_spec.rb
+++ b/spec/unit/lib/cloud_controller/routing_api/router_group_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/routing_api/router_group'
 
 module VCAP::CloudController::RoutingApi
diff --git a/spec/unit/lib/cloud_controller/secrets_fetcher_spec.rb b/spec/unit/lib/cloud_controller/secrets_fetcher_spec.rb
index 90bf1ecc49b..0bf10b0c169 100644
--- a/spec/unit/lib/cloud_controller/secrets_fetcher_spec.rb
+++ b/spec/unit/lib/cloud_controller/secrets_fetcher_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/secrets_fetcher'
 
 module VCAP::CloudController
diff --git a/spec/unit/lib/cloud_controller/steno_configurer_spec.rb b/spec/unit/lib/cloud_controller/steno_configurer_spec.rb
index 13701b49666..eff7922fedf 100644
--- a/spec/unit/lib/cloud_controller/steno_configurer_spec.rb
+++ b/spec/unit/lib/cloud_controller/steno_configurer_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 
+require 'cloud_controller/steno_configurer'
 module VCAP::CloudController
   RSpec.describe StenoConfigurer do
     let(:config_hash) do
diff --git a/spec/unit/lib/cloud_controller/telemetry_logger_spec.rb b/spec/unit/lib/cloud_controller/telemetry_logger_spec.rb
index 418378e7cc8..3b127b3d30e 100644
--- a/spec/unit/lib/cloud_controller/telemetry_logger_spec.rb
+++ b/spec/unit/lib/cloud_controller/telemetry_logger_spec.rb
@@ -1,8 +1,12 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'support/time_helpers'
+require 'vcap/request'
 require 'cloud_controller/telemetry_logger'
 
 module VCAP::CloudController
   RSpec.describe TelemetryLogger do
+    include TimeHelpers
+
     let(:file) { Tempfile.new('telemetry.log') }
 
     before do
diff --git a/spec/unit/lib/cloud_controller/upload_buildpack_spec.rb b/spec/unit/lib/cloud_controller/upload_buildpack_spec.rb
index 507f56f9abd..8b3eb2c621a 100644
--- a/spec/unit/lib/cloud_controller/upload_buildpack_spec.rb
+++ b/spec/unit/lib/cloud_controller/upload_buildpack_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
-  RSpec.describe UploadBuildpack do
+  RSpec.describe UploadBuildpack, :fog_isolation do
     let(:buildpack_blobstore) { double(:buildpack_blobstore).as_null_object }
     let!(:buildpack) { VCAP::CloudController::Buildpack.create_from_hash({ name: 'upload_binary_buildpack', stack: 'cider', position: 0 }) }
 
diff --git a/spec/unit/lib/cloud_controller/url_secret_obfuscator_spec.rb b/spec/unit/lib/cloud_controller/url_secret_obfuscator_spec.rb
index 718a9d00708..5b4375b358c 100644
--- a/spec/unit/lib/cloud_controller/url_secret_obfuscator_spec.rb
+++ b/spec/unit/lib/cloud_controller/url_secret_obfuscator_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 
+require 'cloud_controller/url_secret_obfuscator'
 module CloudController
   RSpec.describe UrlSecretObfuscator do
     describe '#obfuscate' do
diff --git a/spec/unit/lib/http_request_error_spec.rb b/spec/unit/lib/http_request_error_spec.rb
index 5b259a0a9c3..a0f3b0ad48c 100644
--- a/spec/unit/lib/http_request_error_spec.rb
+++ b/spec/unit/lib/http_request_error_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_request_error'
 
 RSpec.describe HttpRequestError do
   let(:endpoint) { 'http://www.example.com/' }
diff --git a/spec/unit/lib/http_response_error_spec.rb b/spec/unit/lib/http_response_error_spec.rb
index 3b8f4e92481..a91ec4569ef 100644
--- a/spec/unit/lib/http_response_error_spec.rb
+++ b/spec/unit/lib/http_response_error_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/http_response_error'
 
 RSpec.describe HttpResponseError do
   describe '#initialize' do
diff --git a/spec/unit/lib/index_stopper_spec.rb b/spec/unit/lib/index_stopper_spec.rb
index bf5eb2ad45c..191fde5d888 100644
--- a/spec/unit/lib/index_stopper_spec.rb
+++ b/spec/unit/lib/index_stopper_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/index_stopper'
 
 module VCAP::CloudController
   RSpec.describe IndexStopper do
diff --git a/spec/unit/lib/rest_controller/common_params_spec.rb b/spec/unit/lib/rest_controller/common_params_spec.rb
index 00c7f2d0c07..a45572e5924 100644
--- a/spec/unit/lib/rest_controller/common_params_spec.rb
+++ b/spec/unit/lib/rest_controller/common_params_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/rest_controller/common_params'
 
 module VCAP::CloudController::RestController
   RSpec.describe CommonParams do
diff --git a/spec/unit/lib/services/service_brokers/null_client_spec.rb b/spec/unit/lib/services/service_brokers/null_client_spec.rb
index db24d26d874..6368364deee 100644
--- a/spec/unit/lib/services/service_brokers/null_client_spec.rb
+++ b/spec/unit/lib/services/service_brokers/null_client_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
 
 module VCAP::Services::ServiceBrokers
   RSpec.describe NullClient do
diff --git a/spec/unit/lib/services/service_brokers/v2/catalog_plan_spec.rb b/spec/unit/lib/services/service_brokers/v2/catalog_plan_spec.rb
index 48666cb0faf..ff9364908bd 100644
--- a/spec/unit/lib/services/service_brokers/v2/catalog_plan_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/catalog_plan_spec.rb
@@ -1,5 +1,15 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'securerandom'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/catalog_validation_helper'
+require 'services/service_brokers/v2/schema'
+require 'services/service_brokers/v2/parameters_schema'
+require 'services/service_brokers/v2/service_binding_schema'
+require 'services/service_brokers/v2/service_instance_schema'
+require 'services/service_brokers/v2/catalog_schemas'
+require 'services/service_brokers/v2/catalog_service'
+require 'services/service_brokers/v2/catalog_plan'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe CatalogPlan do
diff --git a/spec/unit/lib/services/service_brokers/v2/catalog_schemas_spec.rb b/spec/unit/lib/services/service_brokers/v2/catalog_schemas_spec.rb
index b7f4be9d629..12b54cefd07 100644
--- a/spec/unit/lib/services/service_brokers/v2/catalog_schemas_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/catalog_schemas_spec.rb
@@ -1,4 +1,12 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/catalog_validation_helper'
+require 'services/service_brokers/v2/schema'
+require 'services/service_brokers/v2/parameters_schema'
+require 'services/service_brokers/v2/service_binding_schema'
+require 'services/service_brokers/v2/service_instance_schema'
+require 'services/service_brokers/v2/catalog_schemas'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe CatalogSchemas do
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/app_required_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/app_required_spec.rb
index 93382002d4a..0c1fb4cdfdb 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/app_required_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/app_required_spec.rb
@@ -1,4 +1,19 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+
+module VCAP
+  module Services
+    module ServiceBrokers
+      module V2
+      end
+    end
+  end
+end
+
+require 'services/service_brokers/v2/http_response'
+require 'services/service_brokers/v2/errors/app_required'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/async_required_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/async_required_spec.rb
index a1eb2768f7b..2fd786b6f85 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/async_required_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/async_required_spec.rb
@@ -1,4 +1,20 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+require 'cloud_controller/errors/api_error'
+
+module VCAP
+  module Services
+    module ServiceBrokers
+      module V2
+      end
+    end
+  end
+end
+
+require 'services/service_brokers/v2/http_response'
+require 'services/service_brokers/v2/errors/async_required'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
index 12e3a067c5d..e2f058a821b 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/maintenance_info_conflict'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_authentication_failed_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_authentication_failed_spec.rb
index 21d14138b90..e90a4f6e06f 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_authentication_failed_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_authentication_failed_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/service_broker_api_authentication_failed'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_timeout_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_timeout_spec.rb
index 289315dc310..f76987b441c 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_timeout_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_timeout_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_request_error'
+require 'services/service_brokers/v2/errors/service_broker_api_timeout'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_unreachable_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_unreachable_spec.rb
index a03e2e270d4..c4a89133b07 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_unreachable_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_api_unreachable_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_request_error'
+require 'services/service_brokers/v2/errors/service_broker_api_unreachable'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_bad_response_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_bad_response_spec.rb
index b907d985347..a1b6794aa65 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_bad_response_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_bad_response_spec.rb
@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/service_broker_bad_response'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_conflict_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_conflict_spec.rb
index e60dfe67afa..9ba1f571988 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_conflict_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_conflict_spec.rb
@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/service_broker_conflict'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_request_rejected_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_request_rejected_spec.rb
index 9bc59a1bc9b..4d4c8ba64de 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_request_rejected_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_request_rejected_spec.rb
@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'cloud_controller/structured_error'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/service_broker_request_rejected'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_response_malformed_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_response_malformed_spec.rb
index 1d5586dc72d..e0fe29f6524 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/service_broker_response_malformed_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/service_broker_response_malformed_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/http_response_error'
+require 'services/service_brokers/v2/errors/service_broker_response_malformed'
 
 module VCAP::Services
   module ServiceBrokers
diff --git a/spec/unit/lib/services/service_brokers/v2/http_response_spec.rb b/spec/unit/lib/services/service_brokers/v2/http_response_spec.rb
index 6bb0fb164f3..a49c15acb77 100644
--- a/spec/unit/lib/services/service_brokers/v2/http_response_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/http_response_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/http_response'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe HttpResponse do
diff --git a/spec/unit/lib/services/service_brokers/v2/parameters_schema_spec.rb b/spec/unit/lib/services/service_brokers/v2/parameters_schema_spec.rb
index b5c05a53a6b..afb01ced790 100644
--- a/spec/unit/lib/services/service_brokers/v2/parameters_schema_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/parameters_schema_spec.rb
@@ -1,4 +1,10 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/catalog_validation_helper'
+require 'services/service_brokers/v2/schema'
+require 'services/service_brokers/v2/parameters_schema'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe ParametersSchema do
diff --git a/spec/unit/lib/services/service_brokers/v2/service_binding_schema_spec.rb b/spec/unit/lib/services/service_brokers/v2/service_binding_schema_spec.rb
index 4fb0296522d..52951fc4d89 100644
--- a/spec/unit/lib/services/service_brokers/v2/service_binding_schema_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/service_binding_schema_spec.rb
@@ -1,4 +1,12 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'rspec/its'
+require 'rspec/collection_matchers'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/catalog_validation_helper'
+require 'services/service_brokers/v2/schema'
+require 'services/service_brokers/v2/parameters_schema'
+require 'services/service_brokers/v2/service_binding_schema'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe 'schema validation' do
diff --git a/spec/unit/lib/services/service_brokers/v2/service_instance_schema_spec.rb b/spec/unit/lib/services/service_brokers/v2/service_instance_schema_spec.rb
index 5291946785a..a5bd748b7f5 100644
--- a/spec/unit/lib/services/service_brokers/v2/service_instance_schema_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/service_instance_schema_spec.rb
@@ -1,4 +1,12 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'rspec/its'
+require 'rspec/collection_matchers'
+require 'services/validation_errors'
+require 'services/service_brokers/null_client'
+require 'services/service_brokers/v2/catalog_validation_helper'
+require 'services/service_brokers/v2/schema'
+require 'services/service_brokers/v2/parameters_schema'
+require 'services/service_brokers/v2/service_instance_schema'
 
 module VCAP::Services::ServiceBrokers::V2
   RSpec.describe 'schema validation' do
diff --git a/spec/unit/lib/services/sso/commands/claim_client_command_spec.rb b/spec/unit/lib/services/sso/commands/claim_client_command_spec.rb
index 56da6eec81c..5fc33bf78fc 100644
--- a/spec/unit/lib/services/sso/commands/claim_client_command_spec.rb
+++ b/spec/unit/lib/services/sso/commands/claim_client_command_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/claim_client_command'
 
 module VCAP::Services::SSO::Commands
   RSpec.describe ClaimClientCommand do
@@ -8,6 +13,7 @@ module VCAP::Services::SSO::Commands
 
     describe '#db_command' do
       before do
+        stub_const('VCAP::CloudController::ServiceDashboardClient', Class.new)
         allow(VCAP::CloudController::ServiceDashboardClient).to receive(:claim_client)
       end
 
diff --git a/spec/unit/lib/services/sso/commands/create_client_command_spec.rb b/spec/unit/lib/services/sso/commands/create_client_command_spec.rb
index 0c32589a102..9e0bf125e9b 100644
--- a/spec/unit/lib/services/sso/commands/create_client_command_spec.rb
+++ b/spec/unit/lib/services/sso/commands/create_client_command_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/create_client_command'
 
 module VCAP::Services::SSO::Commands
   RSpec.describe CreateClientCommand do
diff --git a/spec/unit/lib/services/sso/commands/delete_client_command_spec.rb b/spec/unit/lib/services/sso/commands/delete_client_command_spec.rb
index 9dac87a651c..5fab3c72d61 100644
--- a/spec/unit/lib/services/sso/commands/delete_client_command_spec.rb
+++ b/spec/unit/lib/services/sso/commands/delete_client_command_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/delete_client_command'
 
 module VCAP::Services::SSO::Commands
   RSpec.describe DeleteClientCommand do
diff --git a/spec/unit/lib/services/sso/commands/unclaim_client_command_spec.rb b/spec/unit/lib/services/sso/commands/unclaim_client_command_spec.rb
index c72951ecda7..a9f540d59ed 100644
--- a/spec/unit/lib/services/sso/commands/unclaim_client_command_spec.rb
+++ b/spec/unit/lib/services/sso/commands/unclaim_client_command_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/unclaim_client_command'
 
 module VCAP::Services::SSO::Commands
   RSpec.describe UnclaimClientCommand do
@@ -8,6 +13,7 @@ module VCAP::Services::SSO::Commands
 
     describe '#db_command' do
       before do
+        stub_const('VCAP::CloudController::ServiceDashboardClient', Class.new)
         allow(VCAP::CloudController::ServiceDashboardClient).to receive(:release_client)
       end
 
diff --git a/spec/unit/lib/services/sso/commands/update_client_command_spec.rb b/spec/unit/lib/services/sso/commands/update_client_command_spec.rb
index 9b933572a62..0a31fd73208 100644
--- a/spec/unit/lib/services/sso/commands/update_client_command_spec.rb
+++ b/spec/unit/lib/services/sso/commands/update_client_command_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/update_client_command'
 
 module VCAP::Services::SSO::Commands
   RSpec.describe UpdateClientCommand do
diff --git a/spec/unit/lib/services/sso/dashboard_client_differ_spec.rb b/spec/unit/lib/services/sso/dashboard_client_differ_spec.rb
index d490f221d3f..f351bb6e92b 100644
--- a/spec/unit/lib/services/sso/dashboard_client_differ_spec.rb
+++ b/spec/unit/lib/services/sso/dashboard_client_differ_spec.rb
@@ -1,4 +1,15 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'rspec/collection_matchers'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+
+require 'services/sso/commands/create_client_command'
+require 'services/sso/commands/update_client_command'
+require 'services/sso/commands/delete_client_command'
+require 'services/sso/commands/claim_client_command'
+require 'services/sso/commands/unclaim_client_command'
+require 'services/sso/dashboard_client_differ'
 
 module VCAP::Services::SSO
   RSpec.describe DashboardClientDiffer do
diff --git a/spec/unit/lib/services/sso/uaa/uaa_client_manager_spec.rb b/spec/unit/lib/services/sso/uaa/uaa_client_manager_spec.rb
index e2a89df6499..4155403182a 100644
--- a/spec/unit/lib/services/sso/uaa/uaa_client_manager_spec.rb
+++ b/spec/unit/lib/services/sso/uaa/uaa_client_manager_spec.rb
@@ -1,4 +1,16 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'webmock/rspec'
+require 'steno/steno'
+require 'uaa'
+
+module VCAP::Services; end
+module VCAP::Services::SSO; end
+module VCAP::Services::SSO::UAA; end
+
+require 'cloud_controller/uaa/errors'
+require 'cloud_controller/uaa/uaa_client'
+require 'services/sso/commands/delete_client_command'
+require 'services/sso/uaa/uaa_client_manager'
 
 module VCAP::Services::SSO::UAA
   RSpec.describe UaaClientManager do
@@ -11,19 +23,25 @@ module VCAP::Services::SSO::UAA
     end
 
     describe '#modify_transaction' do
-      let(:uaa_uri) { VCAP::CloudController::Config.config.get(:uaa, :internal_url) }
+      let(:uaa_uri) { 'https://uaa.service.cf.internal' }
       let(:tx_url) { uaa_uri + '/oauth/clients/tx/modify' }
       let(:auth_header) { 'bearer ACCESSTOKENSTUFF' }
       let(:token_info) { double('info', auth_header:) }
       let(:token_issuer) { double('issuer', client_credentials_grant: token_info) }
 
       before do
+        StubConfig.prepare(self,
+                           uaa: { internal_url: uaa_uri, ca_file: 'spec/fixtures/certs/uaa_ca.crt', client_timeout: 60 },
+                           uaa_client_name: 'cc-service-dashboards',
+                           uaa_client_secret: 'some-sekret',
+                           uaa_client_scope: 'openid,cloud_controller_service_permissions.read')
+
         stub_request(:post, tx_url)
 
         opts = {
           skip_ssl_validation: false,
           ssl_ca_file: 'spec/fixtures/certs/uaa_ca.crt',
-          http_timeout: TestConfig.config_instance.get(:uaa, :client_timeout)
+          http_timeout: 60
         }
 
         allow(CF::UAA::TokenIssuer).to receive(:new).with(uaa_uri, 'cc-service-dashboards', 'some-sekret', opts).
@@ -288,8 +306,11 @@ module VCAP::Services::SSO::UAA
         let(:client_manager) { UaaClientManager.new }
 
         before do
-          allow(VCAP::CloudController::Config.config.config_hash).to receive(:[]).with(anything).and_call_original
-          allow(VCAP::CloudController::Config.config.config_hash).to receive(:[]).with(:uaa_client_scope).and_return(configured_scope)
+          StubConfig.prepare(self,
+                             uaa: { internal_url: uaa_uri, ca_file: 'spec/fixtures/certs/uaa_ca.crt', client_timeout: 60 },
+                             uaa_client_name: 'cc-service-dashboards',
+                             uaa_client_secret: 'some-sekret',
+                             uaa_client_scope: configured_scope)
 
           client_manager.modify_transaction(changeset)
         end
diff --git a/spec/unit/lib/services/validation_errors_spec.rb b/spec/unit/lib/services/validation_errors_spec.rb
index d6917935e8c..091a439e99c 100644
--- a/spec/unit/lib/services/validation_errors_spec.rb
+++ b/spec/unit/lib/services/validation_errors_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'services/validation_errors'
 
 module VCAP::Services
   RSpec.describe ValidationErrors do
diff --git a/spec/unit/lib/structured_error_spec.rb b/spec/unit/lib/structured_error_spec.rb
index fcfde20d570..6addd1fc288 100644
--- a/spec/unit/lib/structured_error_spec.rb
+++ b/spec/unit/lib/structured_error_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/structured_error'
 
 RSpec.describe StructuredError do
   context 'with a hash source' do
diff --git a/spec/unit/lib/uaa/uaa_token_cache_spec.rb b/spec/unit/lib/uaa/uaa_token_cache_spec.rb
index ca595ee8790..328018485dd 100644
--- a/spec/unit/lib/uaa/uaa_token_cache_spec.rb
+++ b/spec/unit/lib/uaa/uaa_token_cache_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'timecop'
+require 'cloud_controller/uaa/uaa_token_cache'
 
 module VCAP::CloudController
   RSpec.describe UaaTokenCache do
diff --git a/spec/unit/lib/uaa/uaa_verification_keys_spec.rb b/spec/unit/lib/uaa/uaa_verification_keys_spec.rb
index a4557fd1201..016951a27b7 100644
--- a/spec/unit/lib/uaa/uaa_verification_keys_spec.rb
+++ b/spec/unit/lib/uaa/uaa_verification_keys_spec.rb
@@ -1,5 +1,10 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'timecop'
+require 'steno/steno'
+require 'uaa'
 require 'cloud_controller/uaa/uaa_verification_keys'
+require 'cloud_controller/uaa/errors'
+require 'cloud_controller/errors/api_error'
 
 module VCAP::CloudController
   RSpec.describe UaaVerificationKeys do
diff --git a/spec/unit/lib/utils/uri_utils_spec.rb b/spec/unit/lib/utils/uri_utils_spec.rb
index a47fa3d05da..7f6b68c57fb 100644
--- a/spec/unit/lib/utils/uri_utils_spec.rb
+++ b/spec/unit/lib/utils/uri_utils_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'utils/uri_utils'
 
 RSpec.describe UriUtils do
diff --git a/spec/unit/lib/vcap/config_spec.rb b/spec/unit/lib/vcap/config_spec.rb
index 2f98bf743a2..bb786a050ed 100644
--- a/spec/unit/lib/vcap/config_spec.rb
+++ b/spec/unit/lib/vcap/config_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'vcap/config'
 
 RSpec.describe VCAP::Config do
diff --git a/spec/unit/lib/vcap/digester_spec.rb b/spec/unit/lib/vcap/digester_spec.rb
index 8177c4ac488..f8777900783 100644
--- a/spec/unit/lib/vcap/digester_spec.rb
+++ b/spec/unit/lib/vcap/digester_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'vcap/digester'
 
 RSpec.describe Digester do
diff --git a/spec/unit/lib/vcap/host_system_spec.rb b/spec/unit/lib/vcap/host_system_spec.rb
index 35f9db905b4..abe0538062d 100644
--- a/spec/unit/lib/vcap/host_system_spec.rb
+++ b/spec/unit/lib/vcap/host_system_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'vcap/host_system'
 
 RSpec.describe VCAP::HostSystem do
diff --git a/spec/unit/messages/app_builds_list_message_spec.rb b/spec/unit/messages/app_builds_list_message_spec.rb
index 177c59aad15..e5d2f3299cd 100644
--- a/spec/unit/messages/app_builds_list_message_spec.rb
+++ b/spec/unit/messages/app_builds_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/app_builds_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/app_feature_update_message_spec.rb b/spec/unit/messages/app_feature_update_message_spec.rb
index 8c580b2aac4..19b9d1178d2 100644
--- a/spec/unit/messages/app_feature_update_message_spec.rb
+++ b/spec/unit/messages/app_feature_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/app_feature_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/app_revisions_list_message_spec.rb b/spec/unit/messages/app_revisions_list_message_spec.rb
index 2a3c7849657..6db2df339f5 100644
--- a/spec/unit/messages/app_revisions_list_message_spec.rb
+++ b/spec/unit/messages/app_revisions_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/app_revisions_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/app_revisions_list_spec.rb b/spec/unit/messages/app_revisions_list_spec.rb
index 141d6e38289..51b762df728 100644
--- a/spec/unit/messages/app_revisions_list_spec.rb
+++ b/spec/unit/messages/app_revisions_list_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/app_revisions_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/app_show_message_spec.rb b/spec/unit/messages/app_show_message_spec.rb
index 61c42b8ce0c..5728293005e 100644
--- a/spec/unit/messages/app_show_message_spec.rb
+++ b/spec/unit/messages/app_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/app_show_message'
 
 module VCAP::CloudController
   RSpec.describe AppShowMessage do
diff --git a/spec/unit/messages/app_usage_events_list_message_spec.rb b/spec/unit/messages/app_usage_events_list_message_spec.rb
index 82840c609bd..dd3b6348c83 100644
--- a/spec/unit/messages/app_usage_events_list_message_spec.rb
+++ b/spec/unit/messages/app_usage_events_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/app_usage_events_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/build_create_message_spec.rb b/spec/unit/messages/build_create_message_spec.rb
index 93ed5de3a41..ed3d937b613 100644
--- a/spec/unit/messages/build_create_message_spec.rb
+++ b/spec/unit/messages/build_create_message_spec.rb
@@ -1,8 +1,15 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/diego/lifecycles/lifecycles'
+require 'messages/empty_lifecycle_data_message'
 require 'messages/build_create_message'
 
 module VCAP::CloudController
   RSpec.describe BuildCreateMessage do
+    before do
+      config = instance_double(VCAP::CloudController::Config, get: 'buildpack')
+      allow(VCAP::CloudController::Config).to receive(:config).and_return(config)
+    end
+
     describe 'validations' do
       context 'when no params are given' do
         let(:params) {}
diff --git a/spec/unit/messages/buildpack_create_message_spec.rb b/spec/unit/messages/buildpack_create_message_spec.rb
index 36f766a63fa..c290aa55e4d 100644
--- a/spec/unit/messages/buildpack_create_message_spec.rb
+++ b/spec/unit/messages/buildpack_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/buildpack_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/buildpack_update_message_spec.rb b/spec/unit/messages/buildpack_update_message_spec.rb
index c467f597e44..4effebc8d8f 100644
--- a/spec/unit/messages/buildpack_update_message_spec.rb
+++ b/spec/unit/messages/buildpack_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/buildpack_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/buildpacks_list_message_spec.rb b/spec/unit/messages/buildpacks_list_message_spec.rb
index 605c4fbac5e..b70b3b74ea1 100644
--- a/spec/unit/messages/buildpacks_list_message_spec.rb
+++ b/spec/unit/messages/buildpacks_list_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/diego/lifecycles/lifecycles'
 require 'messages/buildpacks_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/builds_list_message_spec.rb b/spec/unit/messages/builds_list_message_spec.rb
index ef1d204cb22..5ef331d1c1f 100644
--- a/spec/unit/messages/builds_list_message_spec.rb
+++ b/spec/unit/messages/builds_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/builds_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/deployment_update_message_spec.rb b/spec/unit/messages/deployment_update_message_spec.rb
index 816d09de210..bdb41ce7c55 100644
--- a/spec/unit/messages/deployment_update_message_spec.rb
+++ b/spec/unit/messages/deployment_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/deployment_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/deployments_list_message_spec.rb b/spec/unit/messages/deployments_list_message_spec.rb
index 21ac5240c85..a644738eddc 100644
--- a/spec/unit/messages/deployments_list_message_spec.rb
+++ b/spec/unit/messages/deployments_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/deployments_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domain_create_message_spec.rb b/spec/unit/messages/domain_create_message_spec.rb
index f7dae8db280..f83785791ee 100644
--- a/spec/unit/messages/domain_create_message_spec.rb
+++ b/spec/unit/messages/domain_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domain_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domain_delete_shared_org_message_spec.rb b/spec/unit/messages/domain_delete_shared_org_message_spec.rb
index d1d140ea747..09bdb987737 100644
--- a/spec/unit/messages/domain_delete_shared_org_message_spec.rb
+++ b/spec/unit/messages/domain_delete_shared_org_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domain_delete_shared_org_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domain_show_message_spec.rb b/spec/unit/messages/domain_show_message_spec.rb
index a77e73f83ff..fac785f6fa7 100644
--- a/spec/unit/messages/domain_show_message_spec.rb
+++ b/spec/unit/messages/domain_show_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domain_show_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domain_update_message_spec.rb b/spec/unit/messages/domain_update_message_spec.rb
index 49fc4c6688e..f4b7458940d 100644
--- a/spec/unit/messages/domain_update_message_spec.rb
+++ b/spec/unit/messages/domain_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domain_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domain_update_shared_orgs_message_spec.rb b/spec/unit/messages/domain_update_shared_orgs_message_spec.rb
index 083f63cffc3..fa1168bea87 100644
--- a/spec/unit/messages/domain_update_shared_orgs_message_spec.rb
+++ b/spec/unit/messages/domain_update_shared_orgs_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domain_update_shared_orgs_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/domains_list_message_spec.rb b/spec/unit/messages/domains_list_message_spec.rb
index f8de94fbac6..de69536ab6c 100644
--- a/spec/unit/messages/domains_list_message_spec.rb
+++ b/spec/unit/messages/domains_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/domains_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/droplet_copy_message_spec.rb b/spec/unit/messages/droplet_copy_message_spec.rb
index 3432244cdab..928c7f360b6 100644
--- a/spec/unit/messages/droplet_copy_message_spec.rb
+++ b/spec/unit/messages/droplet_copy_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/droplet_copy_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/droplet_create_message_spec.rb b/spec/unit/messages/droplet_create_message_spec.rb
index 92140109d81..103c75c1624 100644
--- a/spec/unit/messages/droplet_create_message_spec.rb
+++ b/spec/unit/messages/droplet_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/droplet_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/droplet_update_message_spec.rb b/spec/unit/messages/droplet_update_message_spec.rb
index f26e8d628ef..10ab0c67576 100644
--- a/spec/unit/messages/droplet_update_message_spec.rb
+++ b/spec/unit/messages/droplet_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/droplet_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/droplets_list_message_spec.rb b/spec/unit/messages/droplets_list_message_spec.rb
index 7968f110a3a..d1ec3120abe 100644
--- a/spec/unit/messages/droplets_list_message_spec.rb
+++ b/spec/unit/messages/droplets_list_message_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/droplets_list_message'
+require 'messages/spaces_list_message'
 
 module VCAP::CloudController
   RSpec.describe DropletsListMessage do
diff --git a/spec/unit/messages/events_list_message_spec.rb b/spec/unit/messages/events_list_message_spec.rb
index a602ecf7d3d..e83a7e7a6e2 100644
--- a/spec/unit/messages/events_list_message_spec.rb
+++ b/spec/unit/messages/events_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/events_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/feature_flags_list_message_spec.rb b/spec/unit/messages/feature_flags_list_message_spec.rb
index 18a0a3def99..3254709130e 100644
--- a/spec/unit/messages/feature_flags_list_message_spec.rb
+++ b/spec/unit/messages/feature_flags_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/feature_flags_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/feature_flags_update_message_spec.rb b/spec/unit/messages/feature_flags_update_message_spec.rb
index a60416e0128..caad6e59767 100644
--- a/spec/unit/messages/feature_flags_update_message_spec.rb
+++ b/spec/unit/messages/feature_flags_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/feature_flags_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/isolation_segment_create_message_spec.rb b/spec/unit/messages/isolation_segment_create_message_spec.rb
index 21433d30abd..e1d3ab6d624 100644
--- a/spec/unit/messages/isolation_segment_create_message_spec.rb
+++ b/spec/unit/messages/isolation_segment_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/isolation_segment_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/isolation_segment_relationship_org_message_spec.rb b/spec/unit/messages/isolation_segment_relationship_org_message_spec.rb
index 56d22375275..336c4834dc3 100644
--- a/spec/unit/messages/isolation_segment_relationship_org_message_spec.rb
+++ b/spec/unit/messages/isolation_segment_relationship_org_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/isolation_segment_relationship_org_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/isolation_segment_update_message_spec.rb b/spec/unit/messages/isolation_segment_update_message_spec.rb
index 78eabff4d1e..6129cf2ccc4 100644
--- a/spec/unit/messages/isolation_segment_update_message_spec.rb
+++ b/spec/unit/messages/isolation_segment_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/isolation_segment_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/isolation_segments_list_message_spec.rb b/spec/unit/messages/isolation_segments_list_message_spec.rb
index 38ba6a7679f..04b448470d9 100644
--- a/spec/unit/messages/isolation_segments_list_message_spec.rb
+++ b/spec/unit/messages/isolation_segments_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/isolation_segments_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/lifecycles/buildpack_lifecycle_data_message_spec.rb b/spec/unit/messages/lifecycles/buildpack_lifecycle_data_message_spec.rb
index f4e77248fda..319027ae850 100644
--- a/spec/unit/messages/lifecycles/buildpack_lifecycle_data_message_spec.rb
+++ b/spec/unit/messages/lifecycles/buildpack_lifecycle_data_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/base_message'
 require 'messages/buildpack_lifecycle_data_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/manifest_buildpack_message_spec.rb b/spec/unit/messages/manifest_buildpack_message_spec.rb
index 5893616ee1f..7e8e42a59eb 100644
--- a/spec/unit/messages/manifest_buildpack_message_spec.rb
+++ b/spec/unit/messages/manifest_buildpack_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/manifest_buildpack_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/manifest_features_update_message_spec.rb b/spec/unit/messages/manifest_features_update_message_spec.rb
index bfb4ed4a412..758b05ce6c9 100644
--- a/spec/unit/messages/manifest_features_update_message_spec.rb
+++ b/spec/unit/messages/manifest_features_update_message_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'models/helpers/app_features'
+require 'messages/manifest_features_update_message'
 
 module VCAP::CloudController
   RSpec.describe ManifestFeaturesUpdateMessage do
diff --git a/spec/unit/messages/manifest_process_scale_message_spec.rb b/spec/unit/messages/manifest_process_scale_message_spec.rb
index db942e20587..8d2ff3e0fc1 100644
--- a/spec/unit/messages/manifest_process_scale_message_spec.rb
+++ b/spec/unit/messages/manifest_process_scale_message_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/process_scale_message'
+require 'messages/manifest_process_scale_message'
 
 module VCAP::CloudController
   RSpec.describe ManifestProcessScaleMessage do
diff --git a/spec/unit/messages/manifest_process_update_message_spec.rb b/spec/unit/messages/manifest_process_update_message_spec.rb
index f2d06e2de86..3be19f802a8 100644
--- a/spec/unit/messages/manifest_process_update_message_spec.rb
+++ b/spec/unit/messages/manifest_process_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/manifest_process_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/manifest_service_binding_create_message_spec.rb b/spec/unit/messages/manifest_service_binding_create_message_spec.rb
index 0f130549c46..8382b42364a 100644
--- a/spec/unit/messages/manifest_service_binding_create_message_spec.rb
+++ b/spec/unit/messages/manifest_service_binding_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/manifest_service_binding_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/metadata_base_message_spec.rb b/spec/unit/messages/metadata_base_message_spec.rb
index 55b4a553958..ea7f73bbc9e 100644
--- a/spec/unit/messages/metadata_base_message_spec.rb
+++ b/spec/unit/messages/metadata_base_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/metadata_base_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/metadata_list_message_spec.rb b/spec/unit/messages/metadata_list_message_spec.rb
index 6141960861c..89b9fa3bfc6 100644
--- a/spec/unit/messages/metadata_list_message_spec.rb
+++ b/spec/unit/messages/metadata_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/metadata_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/mixins/authentication_message_mixin_spec.rb b/spec/unit/messages/mixins/authentication_message_mixin_spec.rb
index 640703c3d32..d8ad090d833 100644
--- a/spec/unit/messages/mixins/authentication_message_mixin_spec.rb
+++ b/spec/unit/messages/mixins/authentication_message_mixin_spec.rb
@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'active_model'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'messages/base_message'
 require 'messages/mixins/authentication_message_mixin'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/organization_quota_apply_message_spec.rb b/spec/unit/messages/organization_quota_apply_message_spec.rb
index 296233fafe8..87be95c907f 100644
--- a/spec/unit/messages/organization_quota_apply_message_spec.rb
+++ b/spec/unit/messages/organization_quota_apply_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/organization_quota_apply_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/organization_quotas_create_message_spec.rb b/spec/unit/messages/organization_quotas_create_message_spec.rb
index a784c1f605b..1c42ce53ef3 100644
--- a/spec/unit/messages/organization_quotas_create_message_spec.rb
+++ b/spec/unit/messages/organization_quotas_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/organization_quotas_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/organization_quotas_list_message_spec.rb b/spec/unit/messages/organization_quotas_list_message_spec.rb
index 609c5baf255..37be96bd2ea 100644
--- a/spec/unit/messages/organization_quotas_list_message_spec.rb
+++ b/spec/unit/messages/organization_quotas_list_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/organization_quotas_list_message'
 
 module VCAP::CloudController
   RSpec.describe OrganizationQuotasListMessage do
diff --git a/spec/unit/messages/organization_quotas_update_message_spec.rb b/spec/unit/messages/organization_quotas_update_message_spec.rb
index c6ebb798c27..24790e9520d 100644
--- a/spec/unit/messages/organization_quotas_update_message_spec.rb
+++ b/spec/unit/messages/organization_quotas_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/organization_quotas_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/orgs_default_iso_seg_update_message_spec.rb b/spec/unit/messages/orgs_default_iso_seg_update_message_spec.rb
index cc9dba7f302..10723bd2711 100644
--- a/spec/unit/messages/orgs_default_iso_seg_update_message_spec.rb
+++ b/spec/unit/messages/orgs_default_iso_seg_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/orgs_default_iso_seg_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/orgs_list_message_spec.rb b/spec/unit/messages/orgs_list_message_spec.rb
index 43cd77fa63f..dba9686f4d1 100644
--- a/spec/unit/messages/orgs_list_message_spec.rb
+++ b/spec/unit/messages/orgs_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/orgs_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/package_update_message_spec.rb b/spec/unit/messages/package_update_message_spec.rb
index b48536c2653..2bc4d7492cf 100644
--- a/spec/unit/messages/package_update_message_spec.rb
+++ b/spec/unit/messages/package_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/package_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/packages_list_message_spec.rb b/spec/unit/messages/packages_list_message_spec.rb
index c3ef1fa369e..44da2621444 100644
--- a/spec/unit/messages/packages_list_message_spec.rb
+++ b/spec/unit/messages/packages_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/packages_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/process_scale_message_spec.rb b/spec/unit/messages/process_scale_message_spec.rb
index 0a45eeda210..1fba19b83a7 100644
--- a/spec/unit/messages/process_scale_message_spec.rb
+++ b/spec/unit/messages/process_scale_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/process_scale_message'
 require 'messages/base_message'
 
diff --git a/spec/unit/messages/process_show_message_spec.rb b/spec/unit/messages/process_show_message_spec.rb
index be040dbfb7c..bde0a793d00 100644
--- a/spec/unit/messages/process_show_message_spec.rb
+++ b/spec/unit/messages/process_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/process_show_message'
 
 module VCAP::CloudController
   RSpec.describe ProcessShowMessage do
diff --git a/spec/unit/messages/process_update_message_spec.rb b/spec/unit/messages/process_update_message_spec.rb
index 771aaf84ff6..675d77f822f 100644
--- a/spec/unit/messages/process_update_message_spec.rb
+++ b/spec/unit/messages/process_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/process_update_message'
 require 'messages/metadata_base_message'
 
diff --git a/spec/unit/messages/processes_list_message_spec.rb b/spec/unit/messages/processes_list_message_spec.rb
index 4346e772dc6..362ea0f226b 100644
--- a/spec/unit/messages/processes_list_message_spec.rb
+++ b/spec/unit/messages/processes_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/processes_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/purge_message_spec.rb b/spec/unit/messages/purge_message_spec.rb
index e1133671957..32ba2336d91 100644
--- a/spec/unit/messages/purge_message_spec.rb
+++ b/spec/unit/messages/purge_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/purge_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/quotas_apps_message_spec.rb b/spec/unit/messages/quotas_apps_message_spec.rb
index fd3b69390f1..ac04f20529f 100644
--- a/spec/unit/messages/quotas_apps_message_spec.rb
+++ b/spec/unit/messages/quotas_apps_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/quotas_apps_message'
 
 module VCAP::CloudController
   RSpec.describe QuotasAppsMessage do
diff --git a/spec/unit/messages/quotas_routes_message_spec.rb b/spec/unit/messages/quotas_routes_message_spec.rb
index 9007f7c7752..31ebd163af7 100644
--- a/spec/unit/messages/quotas_routes_message_spec.rb
+++ b/spec/unit/messages/quotas_routes_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/quotas_routes_message'
 
 module VCAP::CloudController
   RSpec.describe QuotasRoutesMessage do
diff --git a/spec/unit/messages/quotas_services_message_spec.rb b/spec/unit/messages/quotas_services_message_spec.rb
index 0e1d3bfd8a8..5098f97e3e8 100644
--- a/spec/unit/messages/quotas_services_message_spec.rb
+++ b/spec/unit/messages/quotas_services_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/quotas_services_message'
 
 module VCAP::CloudController
   RSpec.describe QuotasServicesMessage do
diff --git a/spec/unit/messages/revisions_update_message_spec.rb b/spec/unit/messages/revisions_update_message_spec.rb
index bd40a1e8c8e..cafbb9686cd 100644
--- a/spec/unit/messages/revisions_update_message_spec.rb
+++ b/spec/unit/messages/revisions_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/revisions_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/role_create_message_spec.rb b/spec/unit/messages/role_create_message_spec.rb
index 6c900c239d2..c434efb911f 100644
--- a/spec/unit/messages/role_create_message_spec.rb
+++ b/spec/unit/messages/role_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/role_create_message'
 require 'models/helpers/role_types'
 
diff --git a/spec/unit/messages/role_show_message_spec.rb b/spec/unit/messages/role_show_message_spec.rb
index 4494af49dba..024bd7d98c5 100644
--- a/spec/unit/messages/role_show_message_spec.rb
+++ b/spec/unit/messages/role_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/role_show_message'
 
 module VCAP::CloudController
   RSpec.describe RoleShowMessage do
diff --git a/spec/unit/messages/roles_list_message_spec.rb b/spec/unit/messages/roles_list_message_spec.rb
index 15b6aeb1164..e583bddd7d5 100644
--- a/spec/unit/messages/roles_list_message_spec.rb
+++ b/spec/unit/messages/roles_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/roles_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/route_destinations_list_message_spec.rb b/spec/unit/messages/route_destinations_list_message_spec.rb
index 0408310f273..085a25aabfd 100644
--- a/spec/unit/messages/route_destinations_list_message_spec.rb
+++ b/spec/unit/messages/route_destinations_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/route_destinations_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/route_mappings_update_message_spec.rb b/spec/unit/messages/route_mappings_update_message_spec.rb
index 3308ee84046..a5cb2bf58f1 100644
--- a/spec/unit/messages/route_mappings_update_message_spec.rb
+++ b/spec/unit/messages/route_mappings_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/route_mappings_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/route_show_message_spec.rb b/spec/unit/messages/route_show_message_spec.rb
index 3c7fa8378af..e01165d14a6 100644
--- a/spec/unit/messages/route_show_message_spec.rb
+++ b/spec/unit/messages/route_show_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/route_show_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/route_transfer_owner_message_spec.rb b/spec/unit/messages/route_transfer_owner_message_spec.rb
index b4e52e9483f..0bc71c1484a 100644
--- a/spec/unit/messages/route_transfer_owner_message_spec.rb
+++ b/spec/unit/messages/route_transfer_owner_message_spec.rb
@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'messages/process_scale_message'
-require 'messages/base_message'
+require 'lightweight_spec_helper'
+require 'utils/hash_utils'
+require 'messages/route_transfer_owner_message'
 
 module VCAP::CloudController
   RSpec.describe RouteTransferOwnerMessage do
diff --git a/spec/unit/messages/routes_list_message_spec.rb b/spec/unit/messages/routes_list_message_spec.rb
index f4864c2f6cf..fb1febe2382 100644
--- a/spec/unit/messages/routes_list_message_spec.rb
+++ b/spec/unit/messages/routes_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/routes_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/security_group_apply_message_spec.rb b/spec/unit/messages/security_group_apply_message_spec.rb
index d0565f040a9..0bb65773772 100644
--- a/spec/unit/messages/security_group_apply_message_spec.rb
+++ b/spec/unit/messages/security_group_apply_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/security_group_apply_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/security_group_list_message_spec.rb b/spec/unit/messages/security_group_list_message_spec.rb
index 693543d92c2..097576d9eac 100644
--- a/spec/unit/messages/security_group_list_message_spec.rb
+++ b/spec/unit/messages/security_group_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/security_group_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_binding_create_message_spec.rb b/spec/unit/messages/service_binding_create_message_spec.rb
index e26290681f9..95d068450ec 100644
--- a/spec/unit/messages/service_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_binding_create_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'utils/hash_utils'
 require 'messages/service_binding_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_brokers_list_message_spec.rb b/spec/unit/messages/service_brokers_list_message_spec.rb
index cd6a898ea0d..a01c72162f8 100644
--- a/spec/unit/messages/service_brokers_list_message_spec.rb
+++ b/spec/unit/messages/service_brokers_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_brokers_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_credential_app_binding_create_message_spec.rb b/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
index 51fd4d8ad36..a4d1d50160b 100644
--- a/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/service_credential_binding_create_message'
 require 'messages/service_credential_app_binding_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_credential_binding_create_message_spec.rb b/spec/unit/messages/service_credential_binding_create_message_spec.rb
index 15a6db4afbc..f6a407f2129 100644
--- a/spec/unit/messages/service_credential_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_binding_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_credential_binding_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_credential_key_binding_create_message_spec.rb b/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
index 0fb0b74cce0..03ec8edb7bb 100644
--- a/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/service_credential_binding_create_message'
 require 'messages/service_credential_key_binding_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/service_instance_show_message_spec.rb b/spec/unit/messages/service_instance_show_message_spec.rb
index 1bbc1ccca63..39d1833cd2f 100644
--- a/spec/unit/messages/service_instance_show_message_spec.rb
+++ b/spec/unit/messages/service_instance_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/base_message'
 require 'messages/service_instance_show_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/service_instances_list_message_spec.rb b/spec/unit/messages/service_instances_list_message_spec.rb
index 7350c298bf4..828fded5eac 100644
--- a/spec/unit/messages/service_instances_list_message_spec.rb
+++ b/spec/unit/messages/service_instances_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_instances_list_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/service_offering_show_message_spec.rb b/spec/unit/messages/service_offering_show_message_spec.rb
index f530817f416..753bdb6373b 100644
--- a/spec/unit/messages/service_offering_show_message_spec.rb
+++ b/spec/unit/messages/service_offering_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/base_message'
 require 'messages/service_offerings_show_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/service_offerings_list_message_spec.rb b/spec/unit/messages/service_offerings_list_message_spec.rb
index 17bfc0ec7f9..41e09b032b2 100644
--- a/spec/unit/messages/service_offerings_list_message_spec.rb
+++ b/spec/unit/messages/service_offerings_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_offerings_list_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/service_plans_show_message_spec.rb b/spec/unit/messages/service_plans_show_message_spec.rb
index 97980ed644f..6a545bf8bb2 100644
--- a/spec/unit/messages/service_plans_show_message_spec.rb
+++ b/spec/unit/messages/service_plans_show_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_plans_show_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/service_usage_events_list_message_spec.rb b/spec/unit/messages/service_usage_events_list_message_spec.rb
index 6ea7501604a..98c649dc4d5 100644
--- a/spec/unit/messages/service_usage_events_list_message_spec.rb
+++ b/spec/unit/messages/service_usage_events_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/service_usage_events_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/shared_spaces_show_message_spec.rb b/spec/unit/messages/shared_spaces_show_message_spec.rb
index e500270d604..bb554d1a6b1 100644
--- a/spec/unit/messages/shared_spaces_show_message_spec.rb
+++ b/spec/unit/messages/shared_spaces_show_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/shared_spaces_show_message'
 require 'field_message_spec_shared_examples'
 
diff --git a/spec/unit/messages/sidecar_create_message_spec.rb b/spec/unit/messages/sidecar_create_message_spec.rb
index 56305a64a33..0e29e1b9a38 100644
--- a/spec/unit/messages/sidecar_create_message_spec.rb
+++ b/spec/unit/messages/sidecar_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/sidecar_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/sidecar_update_message_spec.rb b/spec/unit/messages/sidecar_update_message_spec.rb
index 62120d914b7..0ad8cce12ee 100644
--- a/spec/unit/messages/sidecar_update_message_spec.rb
+++ b/spec/unit/messages/sidecar_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/sidecar_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/sidecars_list_message_spec.rb b/spec/unit/messages/sidecars_list_message_spec.rb
index 24026d54d1f..c80ac0f9335 100644
--- a/spec/unit/messages/sidecars_list_message_spec.rb
+++ b/spec/unit/messages/sidecars_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/sidecars_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_delete_unmapped_routes_message_spec.rb b/spec/unit/messages/space_delete_unmapped_routes_message_spec.rb
index cad0ac739e3..913df7e71dc 100644
--- a/spec/unit/messages/space_delete_unmapped_routes_message_spec.rb
+++ b/spec/unit/messages/space_delete_unmapped_routes_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/space_delete_unmapped_routes_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_feature_update_message_spec.rb b/spec/unit/messages/space_feature_update_message_spec.rb
index 33df6a702ed..a6684b6b612 100644
--- a/spec/unit/messages/space_feature_update_message_spec.rb
+++ b/spec/unit/messages/space_feature_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/space_feature_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_quota_apply_message_spec.rb b/spec/unit/messages/space_quota_apply_message_spec.rb
index 4e58c4380b9..2910ce40efa 100644
--- a/spec/unit/messages/space_quota_apply_message_spec.rb
+++ b/spec/unit/messages/space_quota_apply_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/space_quota_apply_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_quota_update_message_spec.rb b/spec/unit/messages/space_quota_update_message_spec.rb
index df2b3be26f3..604d44fa9a6 100644
--- a/spec/unit/messages/space_quota_update_message_spec.rb
+++ b/spec/unit/messages/space_quota_update_message_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/quotas_apps_message'
+require 'messages/quotas_routes_message'
+require 'messages/quotas_services_message'
 require 'messages/space_quota_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_quotas_create_message_spec.rb b/spec/unit/messages/space_quotas_create_message_spec.rb
index db248d7456a..9cc8cc256cb 100644
--- a/spec/unit/messages/space_quotas_create_message_spec.rb
+++ b/spec/unit/messages/space_quotas_create_message_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/quotas_apps_message'
+require 'messages/quotas_routes_message'
+require 'messages/quotas_services_message'
 require 'messages/space_quotas_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_quotas_list_message_spec.rb b/spec/unit/messages/space_quotas_list_message_spec.rb
index 7d860405fb9..2a5bfc5b526 100644
--- a/spec/unit/messages/space_quotas_list_message_spec.rb
+++ b/spec/unit/messages/space_quotas_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/space_quotas_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_security_groups_list_message_spec.rb b/spec/unit/messages/space_security_groups_list_message_spec.rb
index df6b99dcd5b..8b5e7892a31 100644
--- a/spec/unit/messages/space_security_groups_list_message_spec.rb
+++ b/spec/unit/messages/space_security_groups_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/space_security_groups_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/space_show_message_spec.rb b/spec/unit/messages/space_show_message_spec.rb
index 5579a646d8b..4eaf060eb87 100644
--- a/spec/unit/messages/space_show_message_spec.rb
+++ b/spec/unit/messages/space_show_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'messages/space_show_message'
 
 module VCAP::CloudController
   RSpec.describe SpaceShowMessage do
diff --git a/spec/unit/messages/space_update_isolation_segment_message_spec.rb b/spec/unit/messages/space_update_isolation_segment_message_spec.rb
index 494e57b9220..226b6dc9053 100644
--- a/spec/unit/messages/space_update_isolation_segment_message_spec.rb
+++ b/spec/unit/messages/space_update_isolation_segment_message_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'utils/hash_utils'
 require 'messages/space_update_isolation_segment_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/spaces_list_message_spec.rb b/spec/unit/messages/spaces_list_message_spec.rb
index 887aa4cf46b..8282f3277c8 100644
--- a/spec/unit/messages/spaces_list_message_spec.rb
+++ b/spec/unit/messages/spaces_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/spaces_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/stack_apps_list_message_spec.rb b/spec/unit/messages/stack_apps_list_message_spec.rb
index a0a18437fb0..06d0590b62c 100644
--- a/spec/unit/messages/stack_apps_list_message_spec.rb
+++ b/spec/unit/messages/stack_apps_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/stack_apps_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/stack_create_message_spec.rb b/spec/unit/messages/stack_create_message_spec.rb
index aadf7b9191b..788f99c0a1c 100644
--- a/spec/unit/messages/stack_create_message_spec.rb
+++ b/spec/unit/messages/stack_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/stack_create_message'
 
 RSpec.describe VCAP::CloudController::StackCreateMessage do
diff --git a/spec/unit/messages/stacks_list_message_spec.rb b/spec/unit/messages/stacks_list_message_spec.rb
index d4e8df06126..4ab4f35c5d7 100644
--- a/spec/unit/messages/stacks_list_message_spec.rb
+++ b/spec/unit/messages/stacks_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/stacks_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/tasks_list_message_spec.rb b/spec/unit/messages/tasks_list_message_spec.rb
index 32177588787..21b08276b70 100644
--- a/spec/unit/messages/tasks_list_message_spec.rb
+++ b/spec/unit/messages/tasks_list_message_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/tasks_list_message'
+require 'messages/packages_list_message'
 
 module VCAP::CloudController
   RSpec.describe TasksListMessage do
diff --git a/spec/unit/messages/to_many_relationship_message_spec.rb b/spec/unit/messages/to_many_relationship_message_spec.rb
index 072cb6f8f05..4ff36a04982 100644
--- a/spec/unit/messages/to_many_relationship_message_spec.rb
+++ b/spec/unit/messages/to_many_relationship_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/to_many_relationship_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/update_environment_variables_message_spec.rb b/spec/unit/messages/update_environment_variables_message_spec.rb
index 3f77983edf1..2453a7e3d9d 100644
--- a/spec/unit/messages/update_environment_variables_message_spec.rb
+++ b/spec/unit/messages/update_environment_variables_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/update_environment_variables_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/user_create_message_spec.rb b/spec/unit/messages/user_create_message_spec.rb
index 40427497f9b..4cf5d80c510 100644
--- a/spec/unit/messages/user_create_message_spec.rb
+++ b/spec/unit/messages/user_create_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/user_create_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/user_update_message_spec.rb b/spec/unit/messages/user_update_message_spec.rb
index 0946a36fc79..e01dc908504 100644
--- a/spec/unit/messages/user_update_message_spec.rb
+++ b/spec/unit/messages/user_update_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/user_update_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/users_list_message_spec.rb b/spec/unit/messages/users_list_message_spec.rb
index 2774262293d..24b2b5cc8bb 100644
--- a/spec/unit/messages/users_list_message_spec.rb
+++ b/spec/unit/messages/users_list_message_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/users_list_message'
 
 module VCAP::CloudController
diff --git a/spec/unit/messages/v2_v3_resource_translator_spec.rb b/spec/unit/messages/v2_v3_resource_translator_spec.rb
index 3df40391155..22a7dc87f19 100644
--- a/spec/unit/messages/v2_v3_resource_translator_spec.rb
+++ b/spec/unit/messages/v2_v3_resource_translator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/v2_v3_resource_translator'
 
 RSpec.describe VCAP::CloudController::V2V3ResourceTranslator do
diff --git a/spec/unit/messages/validators/authentication_validator_spec.rb b/spec/unit/messages/validators/authentication_validator_spec.rb
index de6a2a5d477..65cc6e55ac9 100644
--- a/spec/unit/messages/validators/authentication_validator_spec.rb
+++ b/spec/unit/messages/validators/authentication_validator_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'utils/hash_utils'
+require 'messages/authentication_message'
+require 'messages/basic_credentials_message'
 require 'messages/validators/authentication_validator'
 
 module VCAP::CloudController::Validators
diff --git a/spec/unit/messages/validators/label_selector_requirement_validator_spec.rb b/spec/unit/messages/validators/label_selector_requirement_validator_spec.rb
index 396973ba2fd..02a74749558 100644
--- a/spec/unit/messages/validators/label_selector_requirement_validator_spec.rb
+++ b/spec/unit/messages/validators/label_selector_requirement_validator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'models/helpers/label_selector_requirement'
 require 'messages/validators/label_selector_requirement_validator'
 
 module VCAP::CloudController::Validators
diff --git a/spec/unit/messages/validators/metadata_validator_spec.rb b/spec/unit/messages/validators/metadata_validator_spec.rb
index 1bb048a232e..7f5ba71bd7a 100644
--- a/spec/unit/messages/validators/metadata_validator_spec.rb
+++ b/spec/unit/messages/validators/metadata_validator_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'utils/hash_utils'
 require 'messages/validators/metadata_validator'
 
 module VCAP::CloudController::Validators
diff --git a/spec/unit/messages/validators/url_validator_spec.rb b/spec/unit/messages/validators/url_validator_spec.rb
index c6521ec0f6d..470699cd037 100644
--- a/spec/unit/messages/validators/url_validator_spec.rb
+++ b/spec/unit/messages/validators/url_validator_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'messages/validators/url_validator'
 
 module VCAP::CloudController::Validators
diff --git a/spec/unit/messages/validators_spec.rb b/spec/unit/messages/validators_spec.rb
index 03e31652f02..046444a1b2e 100644
--- a/spec/unit/messages/validators_spec.rb
+++ b/spec/unit/messages/validators_spec.rb
@@ -6,6 +6,7 @@
 require 'cloud_controller/diego/lifecycles/app_docker_lifecycle'
 require 'cloud_controller/diego/lifecycles/app_buildpack_lifecycle'
 require 'cloud_controller/diego/lifecycles/lifecycles'
+require 'cloud_controller/config'
 require 'rspec/collection_matchers'
 require 'pry'
 
@@ -428,6 +429,11 @@ def validate_each(record, attr_name, value)
     end
 
     describe 'LifecycleValidator' do
+      before do
+        config = instance_double(VCAP::CloudController::Config, get: 'buildpack')
+        allow(VCAP::CloudController::Config).to receive(:config).and_return(config)
+      end
+
       let(:lifecycle_class) do
         Class.new(fake_class) do
           attr_accessor :lifecycle
diff --git a/spec/unit/middleware/below_min_cli_warning_spec.rb b/spec/unit/middleware/below_min_cli_warning_spec.rb
index c443e395ca5..f6c92bc82bd 100644
--- a/spec/unit/middleware/below_min_cli_warning_spec.rb
+++ b/spec/unit/middleware/below_min_cli_warning_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cgi'
 require 'below_min_cli_warning'
 
 module CloudFoundry
@@ -8,7 +9,7 @@ module Middleware
       let(:app) { double(:app, call: [200, {}, 'a body']) }
       let(:env) { { 'HTTP_USER_AGENT' => 'mocked-user-agent', 'REQUEST_PATH' => '/v3/organizations' } }
 
-      before { TestConfig.override(info: { min_cli_version: '7.0.0' }, warn_if_below_min_cli_version: true) }
+      before { StubConfig.prepare(self, info: { min_cli_version: '7.0.0' }, warn_if_below_min_cli_version: true) }
 
       describe 'below min cli version middleware is called' do
         context 'called with outdated cf cli version' do
diff --git a/spec/unit/middleware/cef_logs_spec.rb b/spec/unit/middleware/cef_logs_spec.rb
index e436486fd05..7fa3f173155 100644
--- a/spec/unit/middleware/cef_logs_spec.rb
+++ b/spec/unit/middleware/cef_logs_spec.rb
@@ -1,5 +1,9 @@
-require 'spec_helper'
-require 'request_logs'
+require 'lightweight_spec_helper'
+require 'cef_logs'
+require 'action_dispatch'
+require 'rack/auth/basic'
+require 'cloud_controller/constants'
+require 'timecop'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/cors_spec.rb b/spec/unit/middleware/cors_spec.rb
index e9c9271c410..11176951f21 100644
--- a/spec/unit/middleware/cors_spec.rb
+++ b/spec/unit/middleware/cors_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cors'
+require 'vcap/request'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/mixins/client_ip_spec.rb b/spec/unit/middleware/mixins/client_ip_spec.rb
index f24261a25ee..6f167d12ba0 100644
--- a/spec/unit/middleware/mixins/client_ip_spec.rb
+++ b/spec/unit/middleware/mixins/client_ip_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'action_dispatch'
 require 'mixins/client_ip'
 
 module CloudFoundry
diff --git a/spec/unit/middleware/mixins/user_reset_interval_spec.rb b/spec/unit/middleware/mixins/user_reset_interval_spec.rb
index ebe1ca43277..f18a255f6aa 100644
--- a/spec/unit/middleware/mixins/user_reset_interval_spec.rb
+++ b/spec/unit/middleware/mixins/user_reset_interval_spec.rb
@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'mixins/user_reset_interval'
+require 'timecop'
+require 'securerandom'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/new_relic_custom_attributes_spec.rb b/spec/unit/middleware/new_relic_custom_attributes_spec.rb
index 8f1142c3f3f..8757b6d528c 100644
--- a/spec/unit/middleware/new_relic_custom_attributes_spec.rb
+++ b/spec/unit/middleware/new_relic_custom_attributes_spec.rb
@@ -1,5 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'newrelic_rpm'
+require 'new_relic_custom_attributes'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/request_logs_spec.rb b/spec/unit/middleware/request_logs_spec.rb
index 50a3eedad46..462684dc745 100644
--- a/spec/unit/middleware/request_logs_spec.rb
+++ b/spec/unit/middleware/request_logs_spec.rb
@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'request_logs'
+require 'cloud_controller/logs/request_logs'
+require 'vcap/request'
 
 module CloudFoundry
   module Middleware
@@ -11,7 +13,7 @@ module Middleware
 
       describe 'handling the request' do
         before do
-          VCAP::CloudController::Config.config.get(:db)[:log_db_queries] = true
+          StubConfig.prepare(self, db: { log_db_queries: true })
         end
 
         it 'calls start request on request logs before the request' do
@@ -31,7 +33,7 @@ module Middleware
 
       describe 'when db query logging is disabled' do
         before do
-          VCAP::CloudController::Config.config.get(:db)[:log_db_queries] = false
+          StubConfig.prepare(self, db: { log_db_queries: false })
         end
 
         it 'calls complete request on request logs without db query metrics' do
diff --git a/spec/unit/middleware/request_metrics_spec.rb b/spec/unit/middleware/request_metrics_spec.rb
index 345c7ee26f5..f5e6cfe4dd7 100644
--- a/spec/unit/middleware/request_metrics_spec.rb
+++ b/spec/unit/middleware/request_metrics_spec.rb
@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'request_metrics'
+require 'vcap/request'
+require 'cloud_controller/metrics/request_metrics'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/vcap_request_context_setter_spec.rb b/spec/unit/middleware/vcap_request_context_setter_spec.rb
index 57e857d067b..a9c88a88a4f 100644
--- a/spec/unit/middleware/vcap_request_context_setter_spec.rb
+++ b/spec/unit/middleware/vcap_request_context_setter_spec.rb
@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'vcap_request_context_setter'
+require 'steno/steno'
+require 'vcap/request'
 
 module CloudFoundry
   module Middleware
diff --git a/spec/unit/middleware/zipkin_spec.rb b/spec/unit/middleware/zipkin_spec.rb
index 71cb454542f..05774628070 100644
--- a/spec/unit/middleware/zipkin_spec.rb
+++ b/spec/unit/middleware/zipkin_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'steno/steno'
+require 'vcap/request'
 require 'zipkin'
 require 'securerandom'
 
diff --git a/spec/unit/models/runtime/buildpack_bits_delete_spec.rb b/spec/unit/models/runtime/buildpack_bits_delete_spec.rb
index 17d7ae468d7..695b07496b8 100644
--- a/spec/unit/models/runtime/buildpack_bits_delete_spec.rb
+++ b/spec/unit/models/runtime/buildpack_bits_delete_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
-  RSpec.describe BuildpackBitsDelete do
+  RSpec.describe BuildpackBitsDelete, :fog_isolation do
     let(:staging_timeout) { 144 }
     let(:key) { 'key' }
     let!(:blobstore) do
diff --git a/spec/unit/models/runtime/buildpack_spec.rb b/spec/unit/models/runtime/buildpack_spec.rb
index b21e910276a..1ee3f0ed740 100644
--- a/spec/unit/models/runtime/buildpack_spec.rb
+++ b/spec/unit/models/runtime/buildpack_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'fog_spec_helper'
 
 module VCAP::CloudController
-  RSpec.describe Buildpack, type: :model do
+  RSpec.describe Buildpack, :fog_isolation, type: :model do
     def ordered_buildpacks
       Buildpack.order(:position).map { |bp| [bp.name, bp.position] }
     end
diff --git a/spec/unit/presenters/api/api_presenter_spec.rb b/spec/unit/presenters/api/api_presenter_spec.rb
index fe8b9ba59a1..ab4052afdf7 100644
--- a/spec/unit/presenters/api/api_presenter_spec.rb
+++ b/spec/unit/presenters/api/api_presenter_spec.rb
@@ -1,6 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
 require 'presenters/api/api_presenter'
 
+Oj.default_options = { mode: :compat } unless Oj.default_options[:mode] == :rails || Oj.default_options[:mode] == :compat
+
 RSpec.describe ApiPresenter do
   subject(:presenter) { ApiPresenter.new(record) }
 
diff --git a/spec/unit/presenters/api_url_builder_spec.rb b/spec/unit/presenters/api_url_builder_spec.rb
index 1ad71ea1e81..24e967696f6 100644
--- a/spec/unit/presenters/api_url_builder_spec.rb
+++ b/spec/unit/presenters/api_url_builder_spec.rb
@@ -1,10 +1,15 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'presenters/api_url_builder'
 
 module VCAP::CloudController::Presenters
   RSpec.describe ApiUrlBuilder do
-    let(:scheme) { TestConfig.config[:external_protocol] }
-    let(:host) { TestConfig.config[:external_domain] }
+    let(:scheme) { 'http' }
+    let(:host) { 'api.example.org' }
+
+    before do
+      config = StubConfig.new({ external_protocol: scheme, external_domain: host })
+      allow(VCAP::CloudController::Config).to receive(:config).and_return(config)
+    end
 
     it 'builds a url when path is provided' do
       expected_url = "#{scheme}://#{host}/v3/foo/bar"
diff --git a/spec/unit/presenters/error_presenter_spec.rb b/spec/unit/presenters/error_presenter_spec.rb
index 809aa3e8dbc..46e475db787 100644
--- a/spec/unit/presenters/error_presenter_spec.rb
+++ b/spec/unit/presenters/error_presenter_spec.rb
@@ -1,4 +1,13 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'presenters/error_presenter'
+
+unless defined?(Rails)
+  module Rails
+    def self.env
+      ActiveSupport::StringInquirer.new('test')
+    end
+  end
+end
 
 RSpec.describe ErrorPresenter do
   subject(:presenter) { ErrorPresenter.new(error, test_mode, error_hasher) }
diff --git a/spec/unit/presenters/v2/base_presenter_spec.rb b/spec/unit/presenters/v2/base_presenter_spec.rb
index 11935dbc943..4099fa49eae 100644
--- a/spec/unit/presenters/v2/base_presenter_spec.rb
+++ b/spec/unit/presenters/v2/base_presenter_spec.rb
@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'presenters/v2/base_presenter'
 
 module CloudController::Presenters::V2
   RSpec.describe BasePresenter do
diff --git a/spec/unit/presenters/v2/default_presenter_spec.rb b/spec/unit/presenters/v2/default_presenter_spec.rb
index 78dcdc27156..4e02ad9b7f2 100644
--- a/spec/unit/presenters/v2/default_presenter_spec.rb
+++ b/spec/unit/presenters/v2/default_presenter_spec.rb
@@ -1,4 +1,9 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'sequel'
+require 'sequel_plugins/vcap_serialization'
+require 'presenters/v2/base_presenter'
+require 'presenters/v2/default_presenter'
+require 'presenters/v2/relations_presenter'
 
 module CloudController::Presenters::V2
   RSpec.describe DefaultPresenter do
diff --git a/spec/unit/presenters/v3/app_env_presenter_spec.rb b/spec/unit/presenters/v3/app_env_presenter_spec.rb
index 21cd0ebcdb6..0c02f18986d 100644
--- a/spec/unit/presenters/v3/app_env_presenter_spec.rb
+++ b/spec/unit/presenters/v3/app_env_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/app_env_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/cache_key_presenter_spec.rb b/spec/unit/presenters/v3/cache_key_presenter_spec.rb
index 1005b495554..8615fce76a9 100644
--- a/spec/unit/presenters/v3/cache_key_presenter_spec.rb
+++ b/spec/unit/presenters/v3/cache_key_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/cache_key_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/domain_shared_orgs_presenter_spec.rb b/spec/unit/presenters/v3/domain_shared_orgs_presenter_spec.rb
index 701c16f182b..d118adbfafc 100644
--- a/spec/unit/presenters/v3/domain_shared_orgs_presenter_spec.rb
+++ b/spec/unit/presenters/v3/domain_shared_orgs_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/domain_shared_orgs_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/organization_quota_presenter_spec.rb b/spec/unit/presenters/v3/organization_quota_presenter_spec.rb
index 080fd4c5a83..c5fdad73f6e 100644
--- a/spec/unit/presenters/v3/organization_quota_presenter_spec.rb
+++ b/spec/unit/presenters/v3/organization_quota_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/organization_quota_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/paginated_list_presenter_spec.rb b/spec/unit/presenters/v3/paginated_list_presenter_spec.rb
index 0862d5b4014..c4ce0c120e4 100644
--- a/spec/unit/presenters/v3/paginated_list_presenter_spec.rb
+++ b/spec/unit/presenters/v3/paginated_list_presenter_spec.rb
@@ -1,10 +1,23 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'support/link_helpers'
 require 'presenters/v3/paginated_list_presenter'
 require 'presenters/helpers/censorship'
+require 'cloud_controller/paging/paginated_result'
+require 'cloud_controller/paging/pagination_options'
 
 module VCAP::CloudController::Presenters
   module V3
     RSpec.describe PaginatedListPresenter do
+      include LinkHelpers
+
+      before do
+        StubConfig.prepare(
+          self,
+          external_protocol: 'http',
+          external_domain: 'api.example.org'
+        )
+      end
+
       subject(:presenter) do
         PaginatedListPresenter.new(
           presenter: MonkeyPresenter,
diff --git a/spec/unit/presenters/v3/relationship_presenter_spec.rb b/spec/unit/presenters/v3/relationship_presenter_spec.rb
index f4d0e64dc06..64d4227bea7 100644
--- a/spec/unit/presenters/v3/relationship_presenter_spec.rb
+++ b/spec/unit/presenters/v3/relationship_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'presenters/v3/relationship_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/resource_match_presenter_spec.rb b/spec/unit/presenters/v3/resource_match_presenter_spec.rb
index 1ede234bd96..c876aab760e 100644
--- a/spec/unit/presenters/v3/resource_match_presenter_spec.rb
+++ b/spec/unit/presenters/v3/resource_match_presenter_spec.rb
@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'oj'
+require 'presenters/v3/base_presenter'
 require 'presenters/v3/resource_match_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/route_destination_presenter_spec.rb b/spec/unit/presenters/v3/route_destination_presenter_spec.rb
index 87c4642050e..1460bc2cb37 100644
--- a/spec/unit/presenters/v3/route_destination_presenter_spec.rb
+++ b/spec/unit/presenters/v3/route_destination_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/route_destination_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/route_destinations_presenter_spec.rb b/spec/unit/presenters/v3/route_destinations_presenter_spec.rb
index fea18da3192..01b418e136a 100644
--- a/spec/unit/presenters/v3/route_destinations_presenter_spec.rb
+++ b/spec/unit/presenters/v3/route_destinations_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/route_destination_presenter'
 require 'messages/route_destinations_list_message'
 
diff --git a/spec/unit/presenters/v3/service_offering_presenter_spec.rb b/spec/unit/presenters/v3/service_offering_presenter_spec.rb
index c99864c3223..721ad5c03f6 100644
--- a/spec/unit/presenters/v3/service_offering_presenter_spec.rb
+++ b/spec/unit/presenters/v3/service_offering_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'support/link_helpers'
 require 'presenters/v3/service_offering_presenter'
 
diff --git a/spec/unit/presenters/v3/space_quota_presenter_spec.rb b/spec/unit/presenters/v3/space_quota_presenter_spec.rb
index 93e07b7a858..8123157c9d2 100644
--- a/spec/unit/presenters/v3/space_quota_presenter_spec.rb
+++ b/spec/unit/presenters/v3/space_quota_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/space_quota_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/space_usage_summary_presenter_spec.rb b/spec/unit/presenters/v3/space_usage_summary_presenter_spec.rb
index 2a35d82e1a9..7b8a9b9597e 100644
--- a/spec/unit/presenters/v3/space_usage_summary_presenter_spec.rb
+++ b/spec/unit/presenters/v3/space_usage_summary_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/space_usage_summary_presenter'
 
 module VCAP::CloudController::Presenters::V3
diff --git a/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb b/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb
index 5a3c0172027..e9731e7ea28 100644
--- a/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb
+++ b/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb
@@ -1,8 +1,17 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'support/bootstrap/test_config'
 require 'presenters/v3/to_many_relationship_presenter'
 
 module VCAP::CloudController::Presenters::V3
   RSpec.describe ToManyRelationshipPresenter do
+    before do
+      StubConfig.prepare(
+        self,
+        external_protocol: 'http',
+        external_domain: 'api.example.org'
+      )
+    end
+
     class ToManyRelationship
       def initialize(guid)
         @guid = guid
diff --git a/spec/unit/presenters/v3/to_one_relationship_presenter_spec.rb b/spec/unit/presenters/v3/to_one_relationship_presenter_spec.rb
index fd3cacccd6c..b50d8f2a960 100644
--- a/spec/unit/presenters/v3/to_one_relationship_presenter_spec.rb
+++ b/spec/unit/presenters/v3/to_one_relationship_presenter_spec.rb
@@ -1,8 +1,19 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'support/link_helpers'
 require 'presenters/v3/to_one_relationship_presenter'
 
 module VCAP::CloudController::Presenters::V3
   RSpec.describe ToOneRelationshipPresenter do
+    include LinkHelpers
+
+    before do
+      StubConfig.prepare(
+        self,
+        external_protocol: 'http',
+        external_domain: 'api.example.org'
+      )
+    end
+
     let(:book_class) do
       Class.new do
         def initialize(guid)
diff --git a/spec/unit/repositories/event_types_spec.rb b/spec/unit/repositories/event_types_spec.rb
index 1dcf6997c16..19d6fecb118 100644
--- a/spec/unit/repositories/event_types_spec.rb
+++ b/spec/unit/repositories/event_types_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'repositories/event_types'
 
 module VCAP::CloudController