diff --git a/fakeroot.changes b/fakeroot.changes
index 7889f4f..12c89cf 100644
--- a/fakeroot.changes
+++ b/fakeroot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun May 16 21:18:43 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- stat-ver-riscv.patch: fix _STAT_VER on riscv
+- reenable testsuite
+
 -------------------------------------------------------------------
 Wed Mar 17 14:56:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/fakeroot.spec b/fakeroot.spec
index c383e3d..227aa59 100644
--- a/fakeroot.spec
+++ b/fakeroot.spec
@@ -32,6 +32,7 @@ Patch2:         %{name}-1.21-fix-shell-in-fakeroot
 Patch3:         fakeroot-drop-tartest.patch
 # PATCH-FIX-UPSTREAM
 Patch4:         0001-glibc-2.33-compatibility-fixes.patch
+Patch5:         stat-ver-riscv.patch
 BuildRequires:  automake
 BuildRequires:  fdupes
 # user(daemon)/group(sys) is required for t.tar testsuite
@@ -44,7 +45,7 @@ BuildRequires:  sharutils
 BuildRequires:  group(sys)
 BuildRequires:  user(daemon)
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 
 %description
 fakeroot runs a command in an environment wherein it appears to have
@@ -108,11 +109,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/{faked,fakeroot}{,.1%{ext_man}}
 
 %check
-%if 0%{?suse_version} < 1315
 for type in sysv tcp; do
   %make_build -C obj-$type check
 done
-%endif
 
 %post
 %{_sbindir}/update-alternatives --install %{_bindir}/fakeroot fakeroot %{_bindir}/fakeroot-sysv 20 \
diff --git a/stat-ver-riscv.patch b/stat-ver-riscv.patch
new file mode 100644
index 0000000..5dbcfbc
--- /dev/null
+++ b/stat-ver-riscv.patch
@@ -0,0 +1,13 @@
+Index: fakeroot-1.25.3/libfakeroot.c
+===================================================================
+--- fakeroot-1.25.3.orig/libfakeroot.c
++++ fakeroot-1.25.3/libfakeroot.c
+@@ -91,7 +91,7 @@
+ #endif
+ 
+ #ifndef _STAT_VER
+- #if defined (__aarch64__)
++ #if defined (__aarch64__) || defined (__riscv)
+   #define _STAT_VER 0
+  #elif defined (__x86_64__)
+   #define _STAT_VER 1