diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
index a8f90add..09db2fbb 100644
--- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
+++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
@@ -195,7 +195,7 @@ escrypt_gensalt_r(uint32_t N_log2, uint32_t r, uint32_t p, const uint8_t *src,
         return NULL; /* LCOV_EXCL_LINE */
     }
     if (N_log2 > 63 || ((uint64_t) r * (uint64_t) p >= (1U << 30))) {
-        return NULL;
+        return NULL; /* LCOV_EXCL_LINE */
     }
     dst    = buf;
     *dst++ = '$';
diff --git a/test/default/pwhash_scrypt.c b/test/default/pwhash_scrypt.c
index a2eeaca3..3a8a02ed 100644
--- a/test/default/pwhash_scrypt.c
+++ b/test/default/pwhash_scrypt.c
@@ -260,8 +260,19 @@ tv3(void)
         { "Y0!?iQa9M%5ekffW(`", "$7$" },
         { "Y0!?iQa9M%5ekffW(`", "" },
         { "Y0!?iQa9M%5ekffW(`",
-          "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
-          "" },
+          "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" },
+        { "test",
+          "$7$.6..../.....lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." },
+        { "test",
+          "$7$z6..../.....lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." },
+        { "test",
+          "$7$8zzzzz/.....lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." },
+        { "test",
+          "$7$8zzzzzzzzzz.lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." },
+        { "test",
+          "$7$8.....zzzzz.lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." },
+        { "test",
+          "$7$86..../..../lgPchkGHqbeONR/xtuXyjCrt9kUSg6NlKFQO0OSxo/$.DbajbPYH9T7sg3fOtcgxvJzzfIgJBIxMkeQ8b24YQ." }
     };
     char * out;
     char * passwd;
diff --git a/test/default/pwhash_scrypt.exp b/test/default/pwhash_scrypt.exp
index e0e892a2..fa9320d6 100644
--- a/test/default/pwhash_scrypt.exp
+++ b/test/default/pwhash_scrypt.exp
@@ -29,4 +29,10 @@ pwhash_str failure: [24]
 pwhash_str failure: [25]
 pwhash_str failure: [26]
 pwhash_str failure: [27]
+pwhash_str failure: [28]
+pwhash_str failure: [29]
+pwhash_str failure: [30]
+pwhash_str failure: [31]
+pwhash_str failure: [32]
+pwhash_str failure: [33]
 OK