diff --git a/0021-test-compress-benchmark-skip-loop-iteration-if-size-.patch b/0021-test-compress-benchmark-skip-loop-iteration-if-size-.patch
new file mode 100644
index 0000000..7c51758
--- /dev/null
+++ b/0021-test-compress-benchmark-skip-loop-iteration-if-size-.patch
@@ -0,0 +1,23 @@
+From 15b947fb798cd131355ba9935802d58e92bdba6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Fri, 4 Mar 2016 21:46:47 -0500
+Subject: [PATCH] test-compress-benchmark: skip loop iteration if size is 0
+
+Otherwise we would hit an assert in the compression code.
+---
+ src/journal/test-compress-benchmark.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
+index 5b2d130cd6..0ef6d36a50 100644
+--- a/src/journal/test-compress-benchmark.c
++++ b/src/journal/test-compress-benchmark.c
+@@ -105,6 +105,8 @@ static void test_compress_decompress(const char* label, const char* type,
+                 int r;
+ 
+                 size = permute(i);
++                if (size == 0)
++                        continue;
+ 
+                 log_debug("%s %zu %zu", type, i, size);
+ 
diff --git a/systemd.spec b/systemd.spec
index 30541f8..53c9770 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -54,6 +54,7 @@ Patch0017:      0017-resolved-fix-notification-iteration-logic-when-trans.patch
 Patch0018:      0018-selinux-always-try-to-load-the-full-selinux-db.patch
 Patch0019:      0019-selinux-use-raw-variants-of-security_compute_create-.patch
 Patch0020:      0020-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
+Patch0021:      0021-test-compress-benchmark-skip-loop-iteration-if-size-.patch
 
 Patch0999:      0999-Add-a-workaround-for-linux-net-if.h-conflict.patch