diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index 75f748a30a..7a7795a45b 100644
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -783,7 +783,7 @@ static CURLcode auth_create_digest_http_message(
     goto oom;
   }
 
-  hashthis = curl_maprintf("%s:%s", request, uri_quoted);
+  hashthis = curl_maprintf("%s:%s", request, uripath);
   if(!hashthis) {
     result = CURLE_OUT_OF_MEMORY;
     goto oom;
@@ -908,8 +908,10 @@ static CURLcode auth_create_digest_http_message(
   if(digest->opaque) {
     /* Append the opaque */
     char *opaque_quoted = auth_digest_string_quoted(digest->opaque);
-    if(!opaque_quoted)
+    if(!opaque_quoted) {
+      result = CURLE_OUT_OF_MEMORY;
       goto oom;
+    }
     result = curlx_dyn_addf(&response, ", opaque=\"%s\"", opaque_quoted);
     curlx_free(opaque_quoted);
     if(result)
diff --git a/tests/data/test64 b/tests/data/test64
index 0db20389d4..d45cd9b220 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -75,7 +75,7 @@ Accept: */*
 
 GET /%TESTNUMBER" HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER\"", response="eacb00efdf72fed986b32b8d42e99bb9"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER\"", response="1ee14b238b3259f17602e9ce41491ef9"
 User-Agent: curl/%VERSION
 Accept: */*