diff --git a/lib/gitlab/testing/clear_process_memory_cache_middleware.rb b/lib/gitlab/testing/clear_process_memory_cache_middleware.rb
index 1e69e5e142d3a1b1262d80e6a41a035d02290803..39bcad271be224e0bbe8aa6ad8ddbcd751412cfe 100644
--- a/lib/gitlab/testing/clear_process_memory_cache_middleware.rb
+++ b/lib/gitlab/testing/clear_process_memory_cache_middleware.rb
@@ -11,6 +11,8 @@ def call(env)
         Gitlab::ProcessMemoryCache.cache_backend.clear
 
         @app.call(env)
+      ensure
+        Gitlab::ProcessMemoryCache.cache_backend.clear
       end
     end
   end
diff --git a/spec/support/helpers/query_recorder.rb b/spec/support/helpers/query_recorder.rb
index d18a1d235846066a4f8a721450a03f5d897d65f2..01839a74e65c25b29605ac0988bab1623c573dd8 100644
--- a/spec/support/helpers/query_recorder.rb
+++ b/spec/support/helpers/query_recorder.rb
@@ -80,7 +80,8 @@ def callback(name, start, finish, message_id, values)
 
       if values[:cached] && skip_cached
         @cached << values[:sql]
-      elsif !skip_schema_queries || !values[:name]&.include?("SCHEMA")
+      elsif !ignorable?(values)
+
         backtrace = @query_recorder_debug ? show_backtrace(values, duration) : nil
         @log << values[:sql]
         store_sql_by_source(values: values, duration: duration, backtrace: backtrace)
@@ -102,5 +103,12 @@ def log_message
     def occurrences
       @occurrences ||= @log.group_by(&:to_s).transform_values(&:count)
     end
+
+    def ignorable?(values)
+      return true if skip_schema_queries && values[:name]&.include?("SCHEMA")
+      return true if values[:name]&.match(/License Load/)
+
+      false
+    end
   end
 end