diff --git a/borgbackup.spec b/borgbackup.spec
index eb58f66..8a4b44a 100644
--- a/borgbackup.spec
+++ b/borgbackup.spec
@@ -1,6 +1,6 @@
 %global srcname borgbackup
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} == 8
   %global bundle_msgpack 1
 %else
   %global bundle_msgpack 0
@@ -145,7 +145,7 @@ export LANG=en_US.UTF-8
 # exclude test_fuse: there is no modprobe in mock for fuse
 # exclude benchmark: not relevant for package build
 TEST_SELECTOR="not test_fuse and not benchmark"
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
 # exclude test_dash_open: pytest stub has a bug and is fixed in 3.0.2 (epel7 uses 2.8.5)
 TEST_SELECTOR="$TEST_SELECTOR and not test_dash_open"
 %endif