diff --git a/lisp/init/cask.el b/lisp/init/cask.el
index 4ea622a9..95ef4ecb 100644
--- a/lisp/init/cask.el
+++ b/lisp/init/cask.el
@@ -206,7 +206,7 @@ Optional argument CONTENTS is used for nested directives.  e.g. development."
 
 (eask-start
   ;; Preparation
-  (eask-with-archives `("jcs-elpa" "melpa")
+  (eask-with-archives `("gnu" "melpa" "jcs-elpa")
     (eask-package-install 'package-build)
     (eask-package-install 'cask))
 
diff --git a/lisp/lint/elisp-lint.el b/lisp/lint/elisp-lint.el
index a1793165..80f3bbb2 100644
--- a/lisp/lint/elisp-lint.el
+++ b/lisp/lint/elisp-lint.el
@@ -52,7 +52,7 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
+  (eask-with-archives '("gnu" "melpa")
     (eask-package-install 'elisp-lint))
   (setq eask--elisp-lint-version (eask-package--version-string 'elisp-lint))
 
diff --git a/lisp/lint/elsa.el b/lisp/lint/elsa.el
index 9625c9d0..424d3390 100644
--- a/lisp/lint/elsa.el
+++ b/lisp/lint/elsa.el
@@ -60,7 +60,7 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
+  (eask-with-archives '("gnu" "melpa")
     (eask-package-install 'elsa))
   (setq eask--elsa-version (eask-package--version-string 'elsa))
 
diff --git a/lisp/lint/package.el b/lisp/lint/package.el
index 0387bfc5..37d35a62 100644
--- a/lisp/lint/package.el
+++ b/lisp/lint/package.el
@@ -55,7 +55,7 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
+  (eask-with-archives '("gnu" "melpa")
     (eask-package-install 'package-lint))
   (setq eask--package-lint-version (eask-package--version-string 'package-lint))
 
diff --git a/lisp/test/ert-runner.el b/lisp/test/ert-runner.el
index 1d0592bf..03ea3daa 100644
--- a/lisp/test/ert-runner.el
+++ b/lisp/test/ert-runner.el
@@ -20,7 +20,7 @@
             (when (= eask-verbosity 4) (setq ert-runner-verbose t))))
 
 (eask-start
-  (eask-with-archives "melpa"
+  (eask-with-archives '("gnu" "melpa")
     (eask-package-install 'ert-runner))
   (require 'ert-runner))
 
diff --git a/lisp/test/melpazoid.el b/lisp/test/melpazoid.el
index 3c8df4f9..2658a6bd 100644
--- a/lisp/test/melpazoid.el
+++ b/lisp/test/melpazoid.el
@@ -30,7 +30,7 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
+  (eask-with-archives '("gnu" "melpa")
     (eask-package-install 'package-lint)
     (eask-package-install 'pkg-info))
   ;; Start test