diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c8c950210ce..76f66dfa907 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -136,12 +136,8 @@ jobs:
           key: ${{ runner.os }}-plugin-gems-${{matrix.ruby}}-${{ hashFiles('plugins/*/plugin.rb') }}
 
       - name: Checkout official themes
-        if: matrix.target == 'themes' && matrix.build_type == 'system'
-        run: bin/rake themes:clone_all_official
-
-      - name: Pull compatible versions of themes
         if: matrix.target == 'themes'
-        run: bin/rake themes:pull_compatible_all
+        run: bin/rake themes:clone_all_official themes:pull_compatible_all
 
       - name: Add hosts to /etc/hosts, otherwise Chromium cannot reach minio
         if: matrix.build_type == 'system' && matrix.target == 'core'
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 1d822bb94cd..4ad2c29d0c2 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -251,7 +251,7 @@ end
 # Note that this should only be used in CI where it is safe to mutate the database without rolling back since running
 # the themes QUnit tests requires the themes to be installed in the database.
 desc "Runs qunit tests for all official themes"
-task "themes:qunit_all_official" => ["themes:clone_all_official", :environment] do |task, args|
+task "themes:qunit_all_official" => :environment do |task, args|
   theme_ids_with_qunit_tests = []
 
   ThemeMetadata::OFFICIAL_THEMES.each do |theme_name|