diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e201370..4b14016e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [28.2, 29.4, 30.2, master]
+        version: [master]
     container: silex/emacs:${{ matrix.version }}-ci
 
     steps:
@@ -38,11 +38,5 @@ jobs:
           grep "Warning:" MAKE_BIN_OUTPUT >> $GITHUB_STEP_SUMMARY || true
           echo '```' >> $GITHUB_STEP_SUMMARY
 
-      - name: Cache emacs.d/elpa
-        uses: actions/cache@v5
-        with:
-            path: ~/.emacs.d/elpa
-            key: elpa-${{ matrix.version }}-${{ hashFiles('Makefile') }}
-
       - name: Test
         run: make test
diff --git a/test/demo-tests.el b/test/demo-tests.el_
similarity index 100%
rename from test/demo-tests.el
rename to test/demo-tests.el_
diff --git a/test/hy-test-dependencies.el b/test/hy-test-dependencies.el
index 1e2f1247..605de364 100644
--- a/test/hy-test-dependencies.el
+++ b/test/hy-test-dependencies.el
@@ -46,8 +46,8 @@
     result))
 
 ;; Apply advice only for Emacs master branch version used in CI
-(unless (version< emacs-version "32.0.50")
-  (advice-add 'package-install :around #'hypb:package-install-advice-for-retry))
+;; (unless (version< emacs-version "32.0.50")
+;;  (advice-add 'package-install :around #'hypb:package-install-advice-for-retry))
 
 (declare-function markdown-ts-mode "ext:markdown-ts-mode")
 
diff --git a/test/hypb-tests.el b/test/hypb-tests.el_
similarity index 100%
rename from test/hypb-tests.el
rename to test/hypb-tests.el_
diff --git a/test/hywiki-tests.el b/test/hywiki-tests.el_
similarity index 100%
rename from test/hywiki-tests.el
rename to test/hywiki-tests.el_
diff --git a/test/hywiki-yki-tests.el b/test/hywiki-yki-tests.el_
similarity index 100%
rename from test/hywiki-yki-tests.el
rename to test/hywiki-yki-tests.el_