diff --git a/libkcapi.spec b/libkcapi.spec
index df56972..6cce4b3 100644
--- a/libkcapi.spec
+++ b/libkcapi.spec
@@ -22,6 +22,14 @@
 %else
 %bcond_with test_package
 %endif
+# disable cppcheck analysis in ELN/RHEL to avoid the dependency bz#1931518
+%if 0%{?rhel}
+%bcond_with cppcheck
+%else
+# Temporarily disable cppcheck on Fedora until bz#1923600 is fixed in rawhide
+%bcond_with cppcheck
+#bcond_without cppcheck
+%endif
 
 # This package needs at least Linux Kernel v4.10.0.
 %global min_kernel_ver    4.10.0
@@ -106,13 +114,6 @@ done                                                             \
   "$lib_path"/fipscheck/libkcapi.so.%{vmajor}.hmac               \
 %{nil}
 
-# disable cppcheck analysis in ELN/RHEL to avoid the dependency bz#1931518
-%if 0%{?rhel}
-%bcond_with cppcheck
-%else
-%bcond_without cppcheck
-%endif
-
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
 Release:        1%{?dist}
@@ -139,11 +140,9 @@ BuildRequires:  perl-interpreter
 BuildRequires:  systemd
 BuildRequires:  xmlto
 BuildRequires:  make
-#Temoporarily disabling cppcheck on Fedora untill #bz1923600
-#is fixed in rawhide
-#%if %{with cppcheck}
-#BuildRequires:  cppcheck
-#%endif
+%if %{with cppcheck}
+BuildRequires:  cppcheck
+%endif
 
 # For ownership of %%{_sysctldir}.
 Requires:       systemd
@@ -387,11 +386,9 @@ done
 %check
 # Some basic sanity checks.
 %make_build scan
-#Temoporarily disabling cppcheck on Fedora untill #bz1923600
-#is fixed in rawhide
-#%if %{with cppcheck}
-#%make_build cppcheck
-#%endif
+%if %{with cppcheck}
+%make_build cppcheck
+%endif
 
 # On some arches `/proc/sys/net/core/optmem_max` is lower than 20480,
 # which is the lowest limit needed to run the testsuite.  If that limit