diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index c07f7b4397a..bd805413639 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -71,13 +71,14 @@ instead of the filename inheritance method."
 	 (user (url-user href))
 	 (pass (url-password href))
 	 (enable-recursive-minibuffers t) ; for url-handler-mode (bug#10298)
+	 (serverport (format "%s:%d" server port))
 	 byserv retval data)
     (setq file (cond
 		(realm realm)
 		((string= "" file) "/")
 		((string-match "/$" file) file)
 		(t (url-file-directory file)))
-	  byserv (cdr-safe (assoc server
+	  byserv (cdr-safe (assoc serverport
 				  (symbol-value url-basic-auth-storage))))
     (cond
      ((and user pass)
@@ -93,9 +94,8 @@ instead of the filename inheritance method."
 		  (url-do-auth-source-search server type :secret user)
                   (and (url-interactive-p)
 		       (read-passwd "Password: " nil (or pass "")))))
-      (setq server (format "%s:%d" server port))
       (set url-basic-auth-storage
-	   (cons (list server
+	   (cons (list serverport
 		       (cons file
 			     (setq retval
 				   (base64-encode-string
@@ -129,9 +129,8 @@ instead of the filename inheritance method."
 			(url-do-auth-source-search server type :secret user)
                         (and (url-interactive-p)
 			     (read-passwd "Password: ")))
-                  server (format "%s:%d" server port)
 		  retval (base64-encode-string (format "%s:%s" user pass) t)
-		  byserv (assoc server (symbol-value url-basic-auth-storage)))
+		  byserv (assoc serverport (symbol-value url-basic-auth-storage)))
 	    (setcdr byserv
 		    (cons (cons file retval) (cdr byserv))))))
      (t (setq retval nil)))
diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el
index 73ca9dd4c83..51ee587de49 100644
--- a/test/lisp/url/url-auth-tests.el
+++ b/test/lisp/url/url-auth-tests.el
@@ -27,6 +27,7 @@
 
 (require 'ert)
 (require 'url-auth)
+(require 'url-http)
 
 (defvar url-auth-test-challenges nil
   "List of challenges for testing.
@@ -133,8 +134,8 @@ server's WWW-Authenticate header field.")
       (should (string= (nth 1 key) (plist-get challenge :expected-ha2)))
       )))
 
-(ert-deftest url-auth-test-digest-auth-retrieve-cache ()
-  "Check how the entry point retrieves cached authentication.
+(ert-deftest url-auth-test-auth-retrieve-cache ()
+  "Check how the basic/digest auth entry point retrieves cached authentication.
 Essential is how realms and paths are matched."
 
   (let* ((url-digest-auth-storage
@@ -150,6 +151,14 @@ Essential is how realms and paths are matched."
             ("rootless.org:80"          ; no "/" entry for this on purpose
              ("/path" "pathuser" "key")
              ("realm" "realmuser" "key"))))
+         (url-http-real-basic-auth-storage
+          (mapcar (pcase-lambda (`(,server . ,auths))
+                    (cons server
+                          (mapcar (pcase-lambda (`(,realm ,user ,secret))
+                                    (cons realm (base64-encode-string
+                                                 (format "%s:%s" user secret) t)))
+                                  auths)))
+                  url-digest-auth-storage))
          (attrs (list (cons "nonce" "servernonce")))
          auth)
 
@@ -215,6 +224,7 @@ Essential is how realms and paths are matched."
                   (list :url "http://rootless.org/path/query?q=a"
                         :realm "realm" :expected-user "realmuser")
                   ))
+      ;; Check digest auth.
       (setq auth (url-digest-auth (plist-get row :url)
                                   nil nil
                                   (plist-get row :realm) attrs))
@@ -223,6 +233,19 @@ Essential is how realms and paths are matched."
                  (should (string-match ".*username=\"\\(.*?\\)\".*" auth))
                  (should (string= (match-string 1 auth)
                                   (plist-get row :expected-user))))
+        (should-not auth))
+      ;; Check basic auth.
+      (setq auth (url-basic-auth (plist-get row :url)
+                                  nil nil
+                                  (plist-get row :realm) attrs))
+      (if (plist-get row :expected-user)
+          (progn (should auth)
+                 (should (string-prefix-p "Basic " auth))
+                 (setq auth (base64-decode-string
+                             (string-remove-prefix "Basic " auth) t))
+                 (should (string-match "\\`\\(.*?\\):key\\'" auth))
+                 (should (string= (match-string 1 auth)
+                                  (plist-get row :expected-user))))
         (should-not auth)))))
 
 (ert-deftest url-auth-test-digest-auth ()