diff --git a/spec/features/edit_file_spec.rb b/spec/features/edit_file_spec.rb
index 5e90ca1caf..870c2c836b 100644
--- a/spec/features/edit_file_spec.rb
+++ b/spec/features/edit_file_spec.rb
@@ -1,19 +1,43 @@
 # frozen_string_literal: true
 RSpec.describe "Editing a file:", type: :feature do
   let(:user) { create(:user) }
-  let(:admin_set) { create(:admin_set) }
   let(:permission_template) { create(:permission_template, source_id: admin_set.id) }
   let!(:workflow) { create(:workflow, allows_access_grant: true, active: true, permission_template_id: permission_template.id) }
-  let(:file_title) { 'Some kind of title' }
-  let(:work) { build(:work, user: user, admin_set_id: admin_set.id) }
-  let(:file_set) { create(:file_set, user: user, title: [file_title]) }
+
+  let(:admin_set) do
+    if Hyrax.config.disable_wings
+      valkyrie_create(:hyrax_admin_set)
+    else
+      create(:admin_set)
+    end
+  end
+
+  let!(:work) do
+    if Hyrax.config.disable_wings
+      valkyrie_create(:monograph, depositor: user.user_key, admin_set_id: admin_set.id, members: [file_set])
+    else
+      build(:work, user: user, admin_set_id: admin_set.id)
+    end
+  end
+
+  let(:file_set) do
+    if Hyrax.config.disable_wings
+      valkyrie_create(:hyrax_file_set, :with_files, title: ['Test File Set'], depositor: user.user_key, read_groups: ['public'], edit_users: [user])
+    else
+      create(:file_set, title: ['Test File Set'], user: user, read_groups: ['public'], edit_users: [user])
+    end
+  end
+
   let(:file) { File.open(fixture_path + '/world.png') }
 
   before do
     sign_in user
-    Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file)
-    work.ordered_members << file_set
-    work.save!
+
+    unless Hyrax.config.disable_wings
+      Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file)
+      work.ordered_members << file_set
+      work.save!
+    end
   end
 
   context 'when the user tries to update file content, but forgets to select a file:' do
@@ -21,13 +45,12 @@
       visit edit_hyrax_file_set_path(file_set)
       click_link 'Versions'
       click_button 'Upload New Version'
-      expect(page).to have_content "Edit #{file_title}"
+      expect(page).to have_content 'There was a problem processing your request.'
+      expect(page).to have_content "Edit #{file_set}"
     end
   end
 
   context 'when the user tries to update permissions' do
-    let(:file_set) { create(:file_set, user: user, title: [file_title], read_groups: ['public']) }
-
     it 'successfully update visibility' do
       visit edit_hyrax_file_set_path(file_set)
       click_link 'Permissions'
@@ -35,10 +58,7 @@
       expect(find('#file_set_visibility_open').checked?).to be(true)
 
       find('#file_set_visibility_authenticated').click
-      within "#permission" do
-        click_button 'Save'
-      end
-
+      find_button('update_permission').click
       expect(page).to have_css('span.badge.badge-info', text: 'Institution')
     end
   end