diff --git a/lib/cloud_controller/diego/reporters/instances_reporter.rb b/lib/cloud_controller/diego/reporters/instances_reporter.rb
index 7874e720d1c..4bb39865a3a 100644
--- a/lib/cloud_controller/diego/reporters/instances_reporter.rb
+++ b/lib/cloud_controller/diego/reporters/instances_reporter.rb
@@ -1,5 +1,6 @@
 require 'utils/workpool'
 require 'cloud_controller/diego/reporters/reporter_mixins'
+require 'cloud_controller/diego/constants'
 require 'diego/lrp_constants'
 
 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..14a7ed863ed 100644
--- a/spec/lightweight_spec_helper.rb
+++ b/spec/lightweight_spec_helper.rb
@@ -2,10 +2,24 @@
 $LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'lib')))
 
 require 'active_support/all'
+require 'active_model'
 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
 
@@ -34,3 +48,19 @@ def get(key)
 RSpec.configure do |rspec_config|
   rspec_config.expose_dsl_globally = false
 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/spec_helper.rb b/spec/spec_helper.rb
index 8dd57e0bbfe..81de6bef119 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,45 +2,6 @@
 require 'rubygems'
 require 'mock_redis'
 
-begin
-  require 'spork'
-  # uncomment the following line to use spork with the debugger
-  # require 'spork/ext/ruby-debug'
-
-  run_spork = !`ps | grep spork | grep -v grep`.empty?
-rescue LoadError
-  run_spork = false
-end
-
-# --- Instructions ---
-# Sort the contents of this file into a Spork.prefork and a Spork.each_run
-# block.
-#
-# The Spork.prefork block is run only once when the spork server is started.
-# You typically want to place most of your (slow) initializer code in here, in
-# particular, require'ing any 3rd-party gems that you don't normally modify
-# during development.
-#
-# The Spork.each_run block is run each time you run your specs.  In case you
-# need to load files that tend to change during development, require them here.
-# With Rails, your application modules are loaded automatically, so sometimes
-# this block can remain empty.
-#
-# Note: You can modify files loaded *from* the Spork.each_run block without
-# restarting the spork server.  However, this file itself will not be reloaded,
-# so if you change any of the code inside the each_run block, you still need to
-# restart the server.  In general, if you have non-trivial code in this file,
-# it's advisable to move it into a separate file so you can easily edit it
-# without restarting spork.  (For example, with RSpec, you could move
-# non-trivial code into a file spec/support/my_helper.rb, making sure that the
-# spec/support/* files are require'd from inside the each_run block.)
-#
-# Any code that is left outside the two blocks will be run during preforking
-# *and* during each_run -- that's probably not what you want.
-#
-# These instructions should self-destruct in 10 seconds.  If they don't, feel
-# free to delete them.
-
 init_block = proc do
   $LOAD_PATH.push(File.expand_path(__dir__))
 
@@ -159,6 +120,15 @@
       # calling this more than once will load tasks again and 'invoke' or 'execute' calls
       # will call rake tasks multiple times
       Application.load_tasks
+
+      # Initialize Fog mock buckets once at suite start.
+      # Tests that need isolated/clean Fog state should use fog_spec_helper.
+      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
 
     rspec_config.before do
@@ -169,15 +139,6 @@
       TestConfig.context = example.metadata[:job_context] || :api
       TestConfig.reset
 
-      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
-
       VCAP::CloudController::SecurityContext.clear
       VCAP::Request.current_id = nil
       allow_any_instance_of(VCAP::CloudController::UaaTokenDecoder).to receive(:uaa_issuer).and_return(UAAIssuer::ISSUER)
@@ -219,18 +180,5 @@
   end
 end
 
-if run_spork
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it to take effect.
-    init_block.call
-  end
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run_block.call
-  end
-else
-  init_block.call
-  each_run_block.call
-end
+init_block.call
+each_run_block.call
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 ec0a7947a6c..67cbf088aaa 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(:buildpack) }
diff --git a/spec/unit/jobs/v3/droplet_bits_copier_spec.rb b/spec/unit/jobs/v3/droplet_bits_copier_spec.rb
index f647632a2e8..b4e06595dcb 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/blobstore/client_provider_spec.rb b/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb
index aef74733752..f3b4843b4ee 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/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/fog/fog_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb
index 92dc3492517..435605fcb1f 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/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_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb
index 6fff02091ff..bab0cd5c9ae 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
         it 'init the correct client when JSON has provider AzureRM' do
           droplets_cfg = Tempfile.new(['droplets', '.json'])
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/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/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/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/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_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/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/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/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/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/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/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_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/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/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/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/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/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/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_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/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/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_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/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/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/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/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 200c8645a13..6fcdf3dd743 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/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/relationship_presenter_spec.rb b/spec/unit/presenters/v3/relationship_presenter_spec.rb
index f4d0e64dc06..cb984c0a50d 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 'db_spec_helper'
 require 'presenters/v3/relationship_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 6484403fd4b..ffc8f8089bf 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..5b475e2b163 100644
--- a/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb
+++ b/spec/unit/presenters/v3/to_many_relationship_presenter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'presenters/v3/to_many_relationship_presenter'
 
 module VCAP::CloudController::Presenters::V3
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