diff --git a/libssh.spec b/libssh.spec
index 5f2445d..c008ed2 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,6 +1,6 @@
 Name:           libssh
 Version:        0.9.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A library implementing the SSH protocol
 License:        LGPLv2+
 URL:            http://www.libssh.org
@@ -12,6 +12,7 @@ Source3:        libssh_client.config
 Source4:        libssh_server.config
 
 Patch0:         loglevel.patch
+Patch1:         s390x_fix.patch
 
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -77,6 +78,8 @@ pushd obj
 
 %cmake .. \
     -DUNIT_TESTING=ON \
+    -DCLIENT_TESTING=ON \
+    -DSERVER_TESTING=ON \
     -DGLOBAL_CLIENT_CONFIG="%{_sysconfdir}/libssh/libssh_client.config" \
     -DGLOBAL_BIND_CONFIG="%{_sysconfdir}/libssh/libssh_server.config"
 
@@ -138,6 +141,11 @@ popd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
 
 %changelog
+* Fri Jan 06 2023 Norbert Pocs <npocs@redhat.com> - 0.9.6-6
+- Enable client and server testing build time
+- Fix failing rekey test on arch s390x
+- Resolves: rhbz#2126342
+
 * Mon Dec 05 2022 Stanislav Zidek <szidek@redhat.com> - 0.9.6-5
 - Fix CI configuration for new TMT
 - Resolves: rhbz#2149910
diff --git a/s390x_fix.patch b/s390x_fix.patch
new file mode 100644
index 0000000..d06e348
--- /dev/null
+++ b/s390x_fix.patch
@@ -0,0 +1,19 @@
+diff --git a/src/packet.c b/src/packet.c
+index ec4a7203..a81eb8e3 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -1752,10 +1752,12 @@ static bool
+ ssh_packet_in_rekey(ssh_session session)
+ {
+     /* We know we are rekeying if we are authenticated and the DH
+-     * status is not finished
++     * status is not finished, but we only queue packets until we've
++     * sent our NEWKEYS.
+      */
+     return (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) &&
+-           (session->dh_handshake_state != DH_STATE_FINISHED);
++           (session->dh_handshake_state != DH_STATE_FINISHED) &&
++           (session->dh_handshake_state != DH_STATE_NEWKEYS_SENT);
+ }
+ 
+ int ssh_packet_send(ssh_session session)