diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec
index 54f4aa9..4803b42 100644
--- a/kmod-testsuite.spec
+++ b/kmod-testsuite.spec
@@ -16,6 +16,10 @@
 #
 
 
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+%define use_zstd 1
+%endif
+
 Name:           kmod-testsuite
 %define lname	libkmod2
 Version:        29
@@ -47,9 +51,11 @@ BuildRequires:  libtool
 BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
-BuildRequires:  zstd
 BuildRequires:  pkgconfig(liblzma) >= 4.99
+%if 0%{?use_zstd}
+BuildRequires:  zstd
 BuildRequires:  pkgconfig(libzstd)
+%endif
 BuildRequires:  pkgconfig(zlib)
 Requires:       suse-module-tools
 %if !0%{?is_opensuse}
@@ -75,7 +81,9 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 	--with-xz \
 	--with-zlib \
 	--with-openssl \
+%if 0%{?use_zstd}
 	--with-zstd \
+%endif
 	--includedir="%_includedir/kmod" \
 	--with-rootlibdir="%_libdir" \
 	--bindir="%_bindir"
diff --git a/kmod.changes b/kmod.changes
index 66594de..1eee19b 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 28 07:38:29 UTC 2021 - Michal Suchanek <msuchanek@suse.com>
+
+- Enable ZSTD on 15.3 as well (boo#1192104).
+- Only test ZSTD in testsuite on releases where it is available.
+
 -------------------------------------------------------------------
 Fri Sep 24 10:40:22 UTC 2021 - Michal Suchanek <msuchanek@suse.de>
 
diff --git a/kmod.spec b/kmod.spec
index 7197863..9bc74ac 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -16,7 +16,7 @@
 #
 
 
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 %define use_zstd 1
 %endif