diff --git a/ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb b/ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
index e932c786e5aab9118887e27c66ef0685138e580d..8b9c1acdfde27ee29a2425bb021f72e9cafc0673 100644
--- a/ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
+++ b/ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
@@ -488,7 +488,7 @@ def create_feedback(user:, project:, params:)
       context 'when deprecate_vulnerabilities_feedback FF is enabled' do
         let_it_be(:vulnerability) { create(:vulnerability) }
         let_it_be(:finding) { create(:vulnerabilities_finding, vulnerability: vulnerability) }
-        let_it_be(:feedback) { create(:vulnerability_feedback, :dismissal, finding_uuid: finding.uuid) }
+        let_it_be(:feedback) { create(:vulnerability_feedback, :dismissal, project: project, finding_uuid: finding.uuid) }
 
         before do
           allow_next_instance_of(VulnerabilityFeedbackModule::UpdateService) do |instance|
diff --git a/ee/spec/models/concerns/filterable_by_test_reports_spec.rb b/ee/spec/models/concerns/filterable_by_test_reports_spec.rb
index 84016298d1fa92a99020adedef8917880fe3b3ea..5fdedba559e57cbd8a676eb8f1f83177f9fd1721 100644
--- a/ee/spec/models/concerns/filterable_by_test_reports_spec.rb
+++ b/ee/spec/models/concerns/filterable_by_test_reports_spec.rb
@@ -5,6 +5,8 @@
 RSpec.describe FilterableByTestReports do
   let(:test_class) do
     Class.new(ApplicationRecord) do
+      self.table_name = 'issues'
+
       include FilterableByTestReports
     end
   end
diff --git a/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb
index de325454b3428bf38723563a2155bfbf47ddcd04..122a94a39c21f2920d7ade2cf797806b4555951f 100644
--- a/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb
+++ b/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb
@@ -40,7 +40,7 @@
     subject(:average_duration_in_seconds) { average.seconds }
 
     context 'when no results' do
-      let(:query) { Issue.none }
+      let(:query) { Issue.joins(:metrics).none }
 
       it { is_expected.to eq(nil) }
     end
@@ -54,7 +54,7 @@
     subject(:average_duration_in_days) { average.days }
 
     context 'when no results' do
-      let(:query) { Issue.none }
+      let(:query) { Issue.joins(:metrics).none }
 
       it { is_expected.to eq(nil) }
     end
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index f0069b894949e38f4d0c79bc6401727927bd8e31..f2bc9b42b774edba6b3e1340cfc22e89839c6549 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -9,7 +9,7 @@
 
   describe 'validations' do
     it { is_expected.to allow_value('Project').for(:source_type) }
-    it { is_expected.not_to allow_value('project').for(:source_type) }
+    it { is_expected.not_to allow_value('Group').for(:source_type) }
     it { is_expected.to validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
   end
 
diff --git a/spec/serializers/entity_date_helper_spec.rb b/spec/serializers/entity_date_helper_spec.rb
index 5a4571339b34871c58532828c2659822bac177e7..70094991c09d633455c306db7cc927f67d23e81d 100644
--- a/spec/serializers/entity_date_helper_spec.rb
+++ b/spec/serializers/entity_date_helper_spec.rb
@@ -47,8 +47,10 @@
   end
 
   describe '#remaining_days_in_words' do
+    let(:current_time) { Time.utc(2017, 3, 17) }
+
     around do |example|
-      travel_to(Time.utc(2017, 3, 17)) { example.run }
+      travel_to(current_time) { example.run }
     end
 
     context 'when less than 31 days remaining' do
@@ -74,10 +76,10 @@
         expect(milestone_remaining).to eq("<strong>1</strong> day remaining")
       end
 
-      it 'returns 1 day remaining when queried mid-day' do
-        travel_back
+      context 'when queried mid-day' do
+        let(:current_time) { Time.utc(2017, 3, 17, 13, 10) }
 
-        travel_to(Time.utc(2017, 3, 17, 13, 10)) do
+        it 'returns 1 day remaining' do
           expect(milestone_remaining).to eq("<strong>1</strong> day remaining")
         end
       end
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb
index 4ca8f26be9ebdf0c039d69f0abc7dbb0ee6fddf1..2a7b36a4c00a0b693b81e9a7e8ef3c70ac87351a 100644
--- a/spec/support/helpers/stub_configuration.rb
+++ b/spec/support/helpers/stub_configuration.rb
@@ -179,7 +179,7 @@ def add_predicates(messages)
   def to_settings(hash)
     hash.transform_values do |value|
       if value.is_a? Hash
-        Settingslogic.new(value.deep_stringify_keys)
+        Settingslogic.new(value.to_h.deep_stringify_keys)
       else
         value
       end
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb
index 6b6338562283857af3e32570d2cfe2db05598ad3..d120e1805e35f20e20fc25f304e8245042202fdd 100644
--- a/spec/support/helpers/stub_object_storage.rb
+++ b/spec/support/helpers/stub_object_storage.rb
@@ -15,7 +15,7 @@ def stub_object_storage_uploader(
         direct_upload: false,
         cdn: {}
   )
-    old_config = Settingslogic.new(config.deep_stringify_keys)
+    old_config = Settingslogic.new(config.to_h.deep_stringify_keys)
     new_config = config.to_h.deep_symbolize_keys.merge({
       enabled: enabled,
       proxy_download: proxy_download,
@@ -30,7 +30,7 @@ def stub_object_storage_uploader(
     allow(config).to receive(:proxy_download) { proxy_download }
     allow(config).to receive(:direct_upload) { direct_upload }
 
-    uploader_config = Settingslogic.new(new_config.deep_stringify_keys)
+    uploader_config = Settingslogic.new(new_config.to_h.deep_stringify_keys)
     allow(uploader).to receive(:object_store_options).and_return(uploader_config)
     allow(uploader.options).to receive(:object_store).and_return(uploader_config)