diff --git a/spec/actors/hyrax/actors/active_fedora_to_valkyrie_spec.rb b/spec/actors/hyrax/actors/active_fedora_to_valkyrie_spec.rb
index 8c9baab4f6..e9d2014d16 100644
--- a/spec/actors/hyrax/actors/active_fedora_to_valkyrie_spec.rb
+++ b/spec/actors/hyrax/actors/active_fedora_to_valkyrie_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hyrax::Actors::ActiveFedoraToValkyrie do
+RSpec.describe Hyrax::Actors::ActiveFedoraToValkyrie, :active_fedora do
   let(:ability)    { :FAKE_ABILITY }
   let(:attrs)      { {} }
   let(:env)        { Hyrax::Actors::Environment.new(work, ability, attrs) }
diff --git a/spec/actors/hyrax/actors/apply_order_actor_spec.rb b/spec/actors/hyrax/actors/apply_order_actor_spec.rb
index eea5eca51a..692c84b1cb 100644
--- a/spec/actors/hyrax/actors/apply_order_actor_spec.rb
+++ b/spec/actors/hyrax/actors/apply_order_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::ApplyOrderActor do
+RSpec.describe Hyrax::Actors::ApplyOrderActor, :active_fedora do
   let(:curation_concern) { create(:work_with_two_children, user: user) }
   let(:ability) { ::Ability.new(user) }
   let(:user) { create(:admin) }
diff --git a/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb b/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb
index 458e1e34ed..a96f6dc0c7 100644
--- a/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb
+++ b/spec/actors/hyrax/actors/apply_permission_template_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::ApplyPermissionTemplateActor do
+RSpec.describe Hyrax::Actors::ApplyPermissionTemplateActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/attach_members_actor_spec.rb b/spec/actors/hyrax/actors/attach_members_actor_spec.rb
index 0918a5ee2a..f95d20be0a 100644
--- a/spec/actors/hyrax/actors/attach_members_actor_spec.rb
+++ b/spec/actors/hyrax/actors/attach_members_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::AttachMembersActor do
+RSpec.describe Hyrax::Actors::AttachMembersActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/cleanup_file_sets_actor_spec.rb b/spec/actors/hyrax/actors/cleanup_file_sets_actor_spec.rb
index a0f8e5279f..37ca92603f 100644
--- a/spec/actors/hyrax/actors/cleanup_file_sets_actor_spec.rb
+++ b/spec/actors/hyrax/actors/cleanup_file_sets_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CleanupFileSetsActor do
+RSpec.describe Hyrax::Actors::CleanupFileSetsActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/cleanup_trophies_actor_spec.rb b/spec/actors/hyrax/actors/cleanup_trophies_actor_spec.rb
index 134a2187b4..81d09d19cd 100644
--- a/spec/actors/hyrax/actors/cleanup_trophies_actor_spec.rb
+++ b/spec/actors/hyrax/actors/cleanup_trophies_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CleanupTrophiesActor do
+RSpec.describe Hyrax::Actors::CleanupTrophiesActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/collections_membership_actor_spec.rb b/spec/actors/hyrax/actors/collections_membership_actor_spec.rb
index c00ddec51b..85c7d6309d 100644
--- a/spec/actors/hyrax/actors/collections_membership_actor_spec.rb
+++ b/spec/actors/hyrax/actors/collections_membership_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CollectionsMembershipActor, skip: (!(Hyrax.config.collection_class < ActiveFedora::Base) || Hyrax.config.use_valkyrie?) do
+RSpec.describe Hyrax::Actors::CollectionsMembershipActor, :active_fedora, skip: (!(Hyrax.config.collection_class < ActiveFedora::Base) || Hyrax.config.use_valkyrie?) do
   let(:user) { create(:user) }
   let(:ability) { ::Ability.new(user) }
   let(:curation_concern) { build(:work, user: user) }
diff --git a/spec/actors/hyrax/actors/create_with_files_actor_spec.rb b/spec/actors/hyrax/actors/create_with_files_actor_spec.rb
index f59580f778..4a99731868 100644
--- a/spec/actors/hyrax/actors/create_with_files_actor_spec.rb
+++ b/spec/actors/hyrax/actors/create_with_files_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CreateWithFilesActor do
+RSpec.describe Hyrax::Actors::CreateWithFilesActor, :active_fedora do
   let(:user) { create(:user) }
   let(:ability) { ::Ability.new(user) }
   let(:work) { create(:generic_work, user: user) }
diff --git a/spec/actors/hyrax/actors/create_with_files_ordered_members_actor_spec.rb b/spec/actors/hyrax/actors/create_with_files_ordered_members_actor_spec.rb
index 51ed8ed1dd..4889008b81 100644
--- a/spec/actors/hyrax/actors/create_with_files_ordered_members_actor_spec.rb
+++ b/spec/actors/hyrax/actors/create_with_files_ordered_members_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CreateWithFilesOrderedMembersActor do
+RSpec.describe Hyrax::Actors::CreateWithFilesOrderedMembersActor, :active_fedora do
   let(:user) { create(:user) }
   let(:ability) { ::Ability.new(user) }
   let(:work) { create(:generic_work, user: user) }
diff --git a/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb b/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
index cc561d350e..17a95947cd 100644
--- a/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
+++ b/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
+RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor, :active_fedora do
   let(:terminator) { Hyrax::Actors::Terminator.new }
   let(:actor) { stack.build(terminator) }
   let(:stack) do
diff --git a/spec/actors/hyrax/actors/create_with_remote_files_ordered_members_actor_spec.rb b/spec/actors/hyrax/actors/create_with_remote_files_ordered_members_actor_spec.rb
index 87ca808013..b132c9747f 100644
--- a/spec/actors/hyrax/actors/create_with_remote_files_ordered_members_actor_spec.rb
+++ b/spec/actors/hyrax/actors/create_with_remote_files_ordered_members_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor do
+RSpec.describe Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor, :active_fedora do
   let(:terminator) { Hyrax::Actors::Terminator.new }
   let(:actor) { stack.build(terminator) }
   let(:stack) do
diff --git a/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb b/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb
index feb37a8e77..997810aa7c 100644
--- a/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb
+++ b/spec/actors/hyrax/actors/default_admin_set_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::DefaultAdminSetActor do
+RSpec.describe Hyrax::Actors::DefaultAdminSetActor, :active_fedora do
   let(:depositor) { build(:user) }
   let(:depositor_ability) { ::Ability.new(depositor) }
   let(:work) { build(:generic_work) }
diff --git a/spec/actors/hyrax/actors/embargo_actor_spec.rb b/spec/actors/hyrax/actors/embargo_actor_spec.rb
index 39a7c4fb79..87910f06f5 100644
--- a/spec/actors/hyrax/actors/embargo_actor_spec.rb
+++ b/spec/actors/hyrax/actors/embargo_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::EmbargoActor do
+RSpec.describe Hyrax::Actors::EmbargoActor, :active_fedora do
   let(:actor) { described_class.new(work) }
   let(:authenticated_vis) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
   let(:public_vis) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
diff --git a/spec/actors/hyrax/actors/featured_work_actor_spec.rb b/spec/actors/hyrax/actors/featured_work_actor_spec.rb
index 91bb51e710..72f7b5410d 100644
--- a/spec/actors/hyrax/actors/featured_work_actor_spec.rb
+++ b/spec/actors/hyrax/actors/featured_work_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::FeaturedWorkActor do
+RSpec.describe Hyrax::Actors::FeaturedWorkActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/file_actor_spec.rb b/spec/actors/hyrax/actors/file_actor_spec.rb
index c0bec0eba7..782f76b008 100644
--- a/spec/actors/hyrax/actors/file_actor_spec.rb
+++ b/spec/actors/hyrax/actors/file_actor_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'wings/valkyrie/query_service'
 
-RSpec.describe Hyrax::Actors::FileActor do
+RSpec.describe Hyrax::Actors::FileActor, :active_fedora do
   include ActionDispatch::TestProcess
   include Hyrax::FactoryHelpers
 
diff --git a/spec/actors/hyrax/actors/file_set_actor_spec.rb b/spec/actors/hyrax/actors/file_set_actor_spec.rb
index 63beb44d92..2f97923801 100644
--- a/spec/actors/hyrax/actors/file_set_actor_spec.rb
+++ b/spec/actors/hyrax/actors/file_set_actor_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'redlock'
 
-RSpec.describe Hyrax::Actors::FileSetActor do
+RSpec.describe Hyrax::Actors::FileSetActor, :active_fedora do
   include ActionDispatch::TestProcess
 
   let(:user)          { create(:user) }
diff --git a/spec/actors/hyrax/actors/file_set_ordered_members_actor_spec.rb b/spec/actors/hyrax/actors/file_set_ordered_members_actor_spec.rb
index 7df489802c..e1c8033374 100644
--- a/spec/actors/hyrax/actors/file_set_ordered_members_actor_spec.rb
+++ b/spec/actors/hyrax/actors/file_set_ordered_members_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::FileSetOrderedMembersActor do
+RSpec.describe Hyrax::Actors::FileSetOrderedMembersActor, :active_fedora do
   include ActionDispatch::TestProcess
 
   let(:user)          { create(:user) }
diff --git a/spec/actors/hyrax/actors/generic_work_actor_spec.rb b/spec/actors/hyrax/actors/generic_work_actor_spec.rb
index a4b271bcb5..e3f6ea9faa 100644
--- a/spec/actors/hyrax/actors/generic_work_actor_spec.rb
+++ b/spec/actors/hyrax/actors/generic_work_actor_spec.rb
@@ -2,7 +2,7 @@
 require 'redlock'
 require 'hyrax/specs/spy_listener'
 
-RSpec.describe Hyrax::Actors::GenericWorkActor do
+RSpec.describe Hyrax::Actors::GenericWorkActor, :active_fedora do
   include ActionDispatch::TestProcess
   let(:env) { Hyrax::Actors::Environment.new(curation_concern, ability, attributes) }
   let(:user) { create(:user) }
diff --git a/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb b/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb
index 6cfe509f53..34f9ac3ec0 100644
--- a/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb
+++ b/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::InterpretVisibilityActor, unless: Hyrax.config.use_valkyrie? do
+RSpec.describe Hyrax::Actors::InterpretVisibilityActor, :active_fedora do
   let(:user) { create(:user) }
   let(:ability) { ::Ability.new(user) }
   let(:curation_concern) { GenericWork.new }
diff --git a/spec/actors/hyrax/actors/lease_actor_spec.rb b/spec/actors/hyrax/actors/lease_actor_spec.rb
index 0d3adf3237..955c8f50bf 100644
--- a/spec/actors/hyrax/actors/lease_actor_spec.rb
+++ b/spec/actors/hyrax/actors/lease_actor_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::LeaseActor do
+RSpec.describe Hyrax::Actors::LeaseActor, :active_fedora do
   let(:actor) { described_class.new(work) }
   let(:authenticated_vis) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
   let(:public_vis) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
diff --git a/spec/actors/hyrax/actors/model_actor_spec.rb b/spec/actors/hyrax/actors/model_actor_spec.rb
index 18b433c746..d59a2a1f95 100644
--- a/spec/actors/hyrax/actors/model_actor_spec.rb
+++ b/spec/actors/hyrax/actors/model_actor_spec.rb
@@ -9,7 +9,7 @@ class CoverActor < ::Hyrax::Actors::AbstractActor
   end
 end
 
-RSpec.describe Hyrax::Actors::ModelActor do
+RSpec.describe Hyrax::Actors::ModelActor, :active_fedora do
   let(:work) { MusicalWork::Cover.new }
   let(:depositor) { create(:user) }
   let(:depositor_ability) { ::Ability.new(depositor) }
diff --git a/spec/actors/hyrax/actors/null_actor_spec.rb b/spec/actors/hyrax/actors/null_actor_spec.rb
index d669710f47..3146f2619e 100644
--- a/spec/actors/hyrax/actors/null_actor_spec.rb
+++ b/spec/actors/hyrax/actors/null_actor_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hyrax::Actors::NullActor do
+RSpec.describe Hyrax::Actors::NullActor, :active_fedora do
   subject(:actor) { described_class.new(spy_actor) }
 
   let(:attributes) { {} }
diff --git a/spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb b/spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
index 9aec514bf0..cd3bed9161 100644
--- a/spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
+++ b/spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::OptimisticLockValidator do
+RSpec.describe Hyrax::Actors::OptimisticLockValidator, :active_fedora do
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:ability) { ::Ability.new(depositor) }
 
diff --git a/spec/actors/hyrax/actors/ordered_members_actor_spec.rb b/spec/actors/hyrax/actors/ordered_members_actor_spec.rb
index 63c08e4d43..612cf4ad76 100644
--- a/spec/actors/hyrax/actors/ordered_members_actor_spec.rb
+++ b/spec/actors/hyrax/actors/ordered_members_actor_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'redlock'
 
-RSpec.describe Hyrax::Actors::OrderedMembersActor do
+RSpec.describe Hyrax::Actors::OrderedMembersActor, :active_fedora do
   include ActionDispatch::TestProcess
 
   let(:user)          { create(:user) }
diff --git a/spec/actors/hyrax/actors/transactional_request_spec.rb b/spec/actors/hyrax/actors/transactional_request_spec.rb
index 68d0dafe42..37e6973ac6 100644
--- a/spec/actors/hyrax/actors/transactional_request_spec.rb
+++ b/spec/actors/hyrax/actors/transactional_request_spec.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Hyrax::Actors::TransactionalRequest do
+RSpec.describe Hyrax::Actors::TransactionalRequest, :active_fedora do
   let(:bad_actor) do
     Class.new(Hyrax::Actors::AbstractActor) do
       def create(attributes)
diff --git a/spec/actors/hyrax/actors/transfer_request_actor_spec.rb b/spec/actors/hyrax/actors/transfer_request_actor_spec.rb
index f7a96f6c0e..e21a09712e 100644
--- a/spec/actors/hyrax/actors/transfer_request_actor_spec.rb
+++ b/spec/actors/hyrax/actors/transfer_request_actor_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rails_helper'
 
-RSpec.describe Hyrax::Actors::TransferRequestActor do
+RSpec.describe Hyrax::Actors::TransferRequestActor, :active_fedora do
   let(:ability) { ::Ability.new(depositor) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
   let(:terminator) { Hyrax::Actors::Terminator.new }
diff --git a/spec/actors/hyrax/actors/valkyrie_to_active_fedora_spec.rb b/spec/actors/hyrax/actors/valkyrie_to_active_fedora_spec.rb
index 9410c64d1a..abc55dbcac 100644
--- a/spec/actors/hyrax/actors/valkyrie_to_active_fedora_spec.rb
+++ b/spec/actors/hyrax/actors/valkyrie_to_active_fedora_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Hyrax::Actors::ValkyrieToActiveFedora do
+RSpec.describe Hyrax::Actors::ValkyrieToActiveFedora, :active_fedora do
   let(:ability)    { :FAKE_ABILITY }
   let(:attrs)      { {} }
   let(:env)        { Hyrax::Actors::Environment.new(work, ability, attrs) }
diff --git a/spec/features/actor_stack_spec.rb b/spec/features/actor_stack_spec.rb
index 3211144dba..1fdacd39a4 100644
--- a/spec/features/actor_stack_spec.rb
+++ b/spec/features/actor_stack_spec.rb
@@ -2,7 +2,7 @@
 require 'rails_helper'
 
 # Integration tests for the full midddleware stack
-RSpec.describe Hyrax::DefaultMiddlewareStack, :clean_repo do
+RSpec.describe Hyrax::DefaultMiddlewareStack, :active_fedora, :clean_repo do
   subject(:actor)  { stack.build(Hyrax::Actors::Terminator.new) }
   let(:ability)    { ::Ability.new(user) }
   let(:attributes) { {} }