diff --git a/dovecot-2.3.11.3-ftbfs1.patch b/dovecot-2.3.11.3-ftbfs1.patch
new file mode 100644
index 0000000..d3a403a
--- /dev/null
+++ b/dovecot-2.3.11.3-ftbfs1.patch
@@ -0,0 +1,15 @@
+diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
+index cf05370035..0a030a2be0 100644
+--- a/src/auth/test-mech.c
++++ b/src/auth/test-mech.c
+@@ -196,8 +196,8 @@ test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_
+ {
+ 	string_t *apop_challenge = t_str_new(128);
+ 
+-	str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
+-		    connect_uid, process_start_time+10);
++	str_printfa(apop_challenge,"<%lx.%lx.%"PRIxTIME_T".", (unsigned long)getpid(),
++		    (unsigned long)connect_uid, process_start_time+10);
+ 	str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
+ 	*len_r = apop_challenge->used;
+ 	return apop_challenge->data;
diff --git a/dovecot-2.3.11.3-ftbfs2.patch b/dovecot-2.3.11.3-ftbfs2.patch
new file mode 100644
index 0000000..d498add
--- /dev/null
+++ b/dovecot-2.3.11.3-ftbfs2.patch
@@ -0,0 +1,22 @@
+diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
+index 0a030a2be0..0a22ff46d0 100644
+--- a/src/auth/test-mech.c
++++ b/src/auth/test-mech.c
+@@ -192,7 +192,7 @@ static void test_mech_handle_challenge(struct auth_request *request,
+ }
+ 
+ static inline const unsigned char *
+-test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
++test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
+ {
+ 	string_t *apop_challenge = t_str_new(128);
+ 
+@@ -323,7 +323,7 @@ static void test_mechs(void)
+ 		struct test_case *test_case = &tests[running_test];
+ 		const struct mech_module *mech = test_case->mech;
+ 		struct auth_request *request;
+-		const char *testname = t_strdup_printf("auth mech %s %d/%lu",
++		const char *testname = t_strdup_printf("auth mech %s %d/%zu",
+ 						       mech->mech_name,
+ 						       running_test+1,
+ 						       N_ELEMENTS(tests));
diff --git a/dovecot23.changes b/dovecot23.changes
index a551509..1ae8df7 100644
--- a/dovecot23.changes
+++ b/dovecot23.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 24 07:59:06 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix test on 32-bit:
+  * dovecot-2.3.11.3-ftbfs1.patch
+  * dovecot-2.3.11.3-ftbfs2.patch
+
 -------------------------------------------------------------------
 Wed Nov  4 15:29:48 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/dovecot23.spec b/dovecot23.spec
index bffa7de..851c64c 100644
--- a/dovecot23.spec
+++ b/dovecot23.spec
@@ -151,6 +151,9 @@ Patch1:         dovecot-2.3.0-better_ssl_defaults.patch
 Patch2:         allow-tls1.3-only.patch
 #               https://github.com/dovecot/core/pull/133
 Patch3:         dovecot-2.3.11.3-gssapi-nul.patch
+# Fix 32-bit test - Similar to https://github.com/dovecot/core/pull/134
+Patch4:         dovecot-2.3.11.3-ftbfs1.patch
+Patch5:         dovecot-2.3.11.3-ftbfs2.patch
 Summary:        IMAP and POP3 Server Written Primarily with Security in Mind
 License:        BSD-3-Clause AND LGPL-2.1-or-later AND MIT
 Group:          Productivity/Networking/Email/Servers
@@ -332,6 +335,8 @@ dovecot tree.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 gzip -9v ChangeLog
 # Fix plugins dir.
 sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf