diff --git a/lib/tasks/gitlab/traces.rake b/lib/tasks/gitlab/traces.rake
index 04b939d23c9c9fa41c913611d7d52334d7933562..46e2f0e523c8ad09b2f10815251cd7db3993287c 100644
--- a/lib/tasks/gitlab/traces.rake
+++ b/lib/tasks/gitlab/traces.rake
@@ -8,17 +8,16 @@ namespace :gitlab do
       logger = Logger.new(STDOUT)
       logger.info('Archiving legacy traces')
 
-      Ci::Build.joins('RIGHT JOIN ci_job_artifacts ON ci_job_artifacts.job_id = ci_builds.id')
-        .finished
-        .where('ci_job_artifacts.file_type <> 3')
-        .group('ci_builds.id')
+      Ci::Build.finished
+        .where('NOT EXISTS (?)',
+          Ci::JobArtifact.select(1).trace.where('ci_builds.id = ci_job_artifacts.job_id'))
         .order(id: :asc)
         .find_in_batches(batch_size: 1000) do |jobs|
         job_ids = jobs.map { |job| [job.id] }
 
         ArchiveLegacyTraceWorker.bulk_perform_async(job_ids)
 
-        logger.info("Scheduled #{job_ids.count} jobs. From #{job_ids.min} #{job_ids.max}")
+        logger.info("Scheduled #{job_ids.count} jobs. From #{job_ids.min} to #{job_ids.max}")
       end
     end
   end
diff --git a/spec/tasks/gitlab/traces_rake_spec.rb b/spec/tasks/gitlab/traces_rake_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d2eaa88f287508b8562ff7cad1682dd705b84188
--- /dev/null
+++ b/spec/tasks/gitlab/traces_rake_spec.rb
@@ -0,0 +1,55 @@
+require 'rake_helper'
+
+describe 'gitlab:traces rake tasks' do
+  before do
+    Rake.application.rake_require 'tasks/gitlab/traces'
+  end
+
+  shared_examples 'passes the job id to worker' do
+    it do
+      expect(ArchiveLegacyTraceWorker).to receive(:bulk_perform_async).with([[job.id]])
+
+      run_rake_task('gitlab:traces:archive')
+    end
+  end
+
+  shared_examples 'does not pass the job id to worker' do
+    it do
+      expect(ArchiveLegacyTraceWorker).not_to receive(:bulk_perform_async)
+
+      run_rake_task('gitlab:traces:archive')
+    end
+  end
+
+  context 'when trace file stored in default path' do
+    let!(:job) { create(:ci_build, :success, :trace_live) }
+
+    it_behaves_like 'passes the job id to worker'
+  end
+
+  context 'when trace is stored in database' do
+    let!(:job) { create(:ci_build, :success) }
+
+    before do
+      job.update_column(:trace, 'trace in db')
+    end
+
+    it_behaves_like 'passes the job id to worker'
+  end
+
+  context 'when job has trace artifact' do
+    let!(:job) { create(:ci_build, :success) }
+
+    before do
+      create(:ci_job_artifact, :trace, job: job)
+    end
+
+    it_behaves_like 'does not pass the job id to worker'
+  end
+
+  context 'when job is not finished yet' do
+    let!(:build) { create(:ci_build, :running, :trace_live) }
+
+    it_behaves_like 'does not pass the job id to worker'
+  end
+end