diff --git a/src/kex.c b/src/kex.c
index a240f757..1b9d0abe 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -89,8 +89,10 @@
 
 #ifdef WITH_ZLIB
 #define ZLIB "none,zlib@openssh.com,zlib"
+#define ZLIB_DEFAULT "none,zlib@openssh.com"
 #else
 #define ZLIB "none"
+#define ZLIB_DEFAULT "none"
 #endif /* WITH_ZLIB */
 
 #ifdef HAVE_CURVE25519
@@ -216,8 +218,8 @@ static const char *fips_methods[] = {
     FIPS_ALLOWED_CIPHERS,
     FIPS_ALLOWED_MACS,
     FIPS_ALLOWED_MACS,
-    ZLIB,
-    ZLIB,
+    ZLIB_DEFAULT,
+    ZLIB_DEFAULT,
     "",
     "",
     NULL
@@ -231,8 +233,8 @@ static const char *default_methods[] = {
     CHACHA20 AES,
     "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512",
     "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512",
-    ZLIB,
-    ZLIB,
+    ZLIB_DEFAULT,
+    ZLIB_DEFAULT,
     "",
     "",
     NULL
diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c
index ea3b647b..60354f9b 100644
--- a/tests/client/torture_algorithms.c
+++ b/tests/client/torture_algorithms.c
@@ -594,24 +594,34 @@ static void torture_algorithms_zlib(void **state) {
 
     rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_C_S, "zlib");
 #ifdef WITH_ZLIB
-    assert_int_equal(rc, SSH_OK);
+    if (ssh_fips_mode()) {
+        assert_int_equal(rc, SSH_ERROR);
+    } else {
+        assert_int_equal(rc, SSH_OK);
+    }
 #else
     assert_int_equal(rc, SSH_ERROR);
 #endif
 
     rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_S_C, "zlib");
 #ifdef WITH_ZLIB
-    assert_int_equal(rc, SSH_OK);
+    if (ssh_fips_mode()) {
+        assert_int_equal(rc, SSH_ERROR);
+    } else {
+        assert_int_equal(rc, SSH_OK);
+    }
 #else
     assert_int_equal(rc, SSH_ERROR);
 #endif
 
     rc = ssh_connect(session);
 #ifdef WITH_ZLIB
-    if (ssh_get_openssh_version(session)) {
-        assert_false(rc == SSH_OK);
-        ssh_disconnect(session);
-        return;
+    if (!ssh_fips_mode()) {
+        if (ssh_get_openssh_version(session)) {
+            assert_false(rc == SSH_OK);
+            ssh_disconnect(session);
+            return;
+        }
     }
 #endif
     assert_int_equal(rc, SSH_OK);