diff --git a/core/core-configuration-layer.el b/core/core-configuration-layer.el
index f09565da5..73eceef60 100644
--- a/core/core-configuration-layer.el
+++ b/core/core-configuration-layer.el
@@ -482,13 +482,7 @@ The returned list has a `package-archives' compliant format."
                  apath
                (concat
                 (if (and dotspacemacs-elpa-https
-                         (not spacemacs-insecure)
-                         ;; for now org ELPA repository does
-                         ;; not support HTTPS
-                         ;; TODO when org ELPA repo support
-                         ;; HTTPS remove the check
-                         ;; `(not (equal "org" aname))'
-                         (not (equal "org" aname)))
+                         (not spacemacs-insecure))
                     "https://"
                   "http://")
                 apath)))))
@@ -2467,7 +2461,7 @@ Original code from dochang at https://github.com/dochang/elpa-clone"
   (configuration-layer/make-all-packages 'no-discover)
   (let (package-archive-contents
         (package-archives '(("melpa" . "https://melpa.org/packages/")
-                            ("org"   . "http://orgmode.org/elpa/")
+                            ("org"   . "https://orgmode.org/elpa/")
                             ("gnu"   . "https://elpa.gnu.org/packages/"))))
     (package-refresh-contents)
     (package-read-all-archive-contents)
diff --git a/tests/core/core-configuration-layer-utest.el b/tests/core/core-configuration-layer-utest.el
index 42f8c6fd0..de1573718 100644
--- a/tests/core/core-configuration-layer-utest.el
+++ b/tests/core/core-configuration-layer-utest.el
@@ -784,16 +784,10 @@
     (should (equal '(("melpa" . "http://melpa.org/packages/"))
                    (configuration-layer//resolve-package-archives input)))))
 
-(ert-deftest test-resolve-package-archives--org-supports-http ()
+(ert-deftest test-resolve-package-archives--org-supports-https ()
   (let ((input '(("org"   . "orgmode.org/elpa/")))
         dotspacemacs-elpa-https)
-    (should (equal '(("org" . "http://orgmode.org/elpa/"))
-                   (configuration-layer//resolve-package-archives input)))))
-
-(ert-deftest test-resolve-package-archives--org-does-not-support-https ()
-  (let ((input '(("org"   . "orgmode.org/elpa/")))
-        (dotspacemacs-elpa-https t))
-    (should (equal '(("org" . "http://orgmode.org/elpa/"))
+    (should (equal '(("org" . "https://orgmode.org/elpa/"))
                    (configuration-layer//resolve-package-archives input)))))
 
 (ert-deftest test-resolve-package-archives--idempotent-when-already-http-prefix ()