diff --git a/ee/spec/services/ci/collect_queueing_history_service_spec.rb b/ee/spec/services/ci/collect_queueing_history_service_spec.rb
index 438c1a7510b5f962ce1a55ca13a7d8bcc60b517a..0fb4c5f80f9b053ec3e9bd9f14b8d832640cbf7a 100644
--- a/ee/spec/services/ci/collect_queueing_history_service_spec.rb
+++ b/ee/spec/services/ci/collect_queueing_history_service_spec.rb
@@ -41,14 +41,14 @@
 
     it 'returns error' do
       expect(result.error?).to eq(true)
-      expect(result.errors).to eq(['Feature not enabled'])
+      expect(result.errors).to contain_exactly('Feature clickhouse_ci_analytics not enabled')
     end
   end
 
   shared_examples "returns Not allowed error" do
     it 'returns error' do
       expect(result.error?).to eq(true)
-      expect(result.errors).to eq(['Not allowed'])
+      expect(result.errors).to contain_exactly('Not allowed')
     end
   end
 
diff --git a/gems/csv_builder/lib/csv_builder/gzip.rb b/gems/csv_builder/lib/csv_builder/gzip.rb
index f97c066705a08e0b6c7781047dbe680d988e8e3e..83a83970acdea2e1d4852933ce076cbbc4bad923 100644
--- a/gems/csv_builder/lib/csv_builder/gzip.rb
+++ b/gems/csv_builder/lib/csv_builder/gzip.rb
@@ -12,12 +12,15 @@ class Gzip < CsvBuilder::Builder
     # >   puts rows
     # > end
     def render
-      Tempfile.open(['csv_builder_gzip', '.csv.gz']) do |tempfile|
-        csv = CSV.new(Zlib::GzipWriter.open(tempfile.path))
+      Tempfile.create(['csv_builder_gzip', '.csv.gz']) do |tempfile|
+        Zlib::GzipWriter.open(tempfile.path) do |gz|
+          csv = CSV.new(gz)
 
-        write_csv csv, until_condition: -> {} # truncation must be handled outside of the CsvBuilder
+          write_csv csv, until_condition: -> {} # truncation must be handled outside of the CsvBuilder
+
+          csv.close
+        end
 
-        csv.close
         yield tempfile, @rows_written
       end
     end