diff --git a/s-nail-testsuite.patch b/s-nail-testsuite.patch
new file mode 100644
index 0000000..c94cd4c
--- /dev/null
+++ b/s-nail-testsuite.patch
@@ -0,0 +1,41 @@
+diff --git a/mx-test.sh b/mx-test.sh
+index 4a26379..0cb9555 100755
+--- a/mx-test.sh
++++ b/mx-test.sh
+@@ -10017,7 +10017,7 @@ t_s_mime() {
+       # Sign/verify
+       echo bla | ${MAILX} ${ARGS} \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' ./.VERIFY >>${ERR} 2>&1
+       check_ex0 ${_z}-estat
+@@ -10028,7 +10028,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.VERIFY > "${MBOX}"
+-      check ${_z} - "${MBOX}" '335634014 644'
++      check ${_z} - "${MBOX}" '374578409 646'
+       _z=`add ${_z} 1`
+ 
+       printf 'verify\nx\n' |
+@@ -10046,7 +10046,7 @@ t_s_mime() {
+       ${MAILX} ${ARGS} \
+          -Smta=test://./.ENCRYPT \
+          -Ssmime-force-encryption -Ssmime-encrypt-recei@ver.com=./.tpair.pem \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' recei@ver.com >>${ERR} 2>&1
+@@ -10071,7 +10071,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.DECRYPT > "${MBOX}"
+-      check ${_z} - "${MBOX}" '2602978204 940'
++      check ${_z} - "${MBOX}" '101680387 942'
+       _z=`add ${_z} 1`
+ 
+       (openssl smime -decrypt ${_ossl} -inkey ./.tkey.pem -in ./.ENCRYPT |
+
diff --git a/s-nail.spec b/s-nail.spec
index 6287764..c5b6f69 100644
--- a/s-nail.spec
+++ b/s-nail.spec
@@ -1,6 +1,6 @@
 Name:           s-nail
 Version:        14.9.22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Environment for sending and receiving mail
 
 # Everything is ISC except parts coming from the original Heirloom mailx which are BSD
@@ -11,6 +11,9 @@ Source1:        https://www.sdaoden.eu/downloads/%{name}-%{version}.tar.xz.asc
 # https://ftp.sdaoden.eu/steffen.asc
 Source2:        steffen.asc
 
+# rhbz#2103212
+Patch0:		s-nail-testsuite.patch
+
 BuildRequires: make
 BuildRequires:  gnupg2
 BuildRequires:  gcc
@@ -137,6 +140,10 @@ fi
 
 
 %changelog
+* Fri Aug 26 2022 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-7
+- Make s-nail testsuite use sha256
+- Resolves: rhbz#2103212
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 14.9.22-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688