diff --git a/fail2ban.spec b/fail2ban.spec
index d188879..9e95afe 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,7 +1,7 @@
 Summary: Daemon to ban hosts that cause multiple authentication errors
 Name: fail2ban
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://fail2ban.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -115,6 +115,14 @@ This package enables support for manipulating tcp_wrapper's /etc/hosts.deny
 files.
 
 
+%package tests
+Summary: Fail2Ban testcases
+Requires: %{name}-server = %{version}-%{release}
+
+%description tests
+This package contains Fail2Ban's testscases and scripts.
+
+
 %package mail
 Summary: Mail actions for Fail2Ban
 Requires: %{name}-server = %{version}-%{release}
@@ -141,7 +149,7 @@ Requires: %{name}-server = %{version}-%{release}
 Requires: shorewall
 
 %description shorewall
-This package enables support for manipulating shoreall rules.
+This package enables support for manipulating shorewall rules.
 
 
 %package systemd
@@ -182,7 +190,7 @@ install -p -m 644 man/*.1 %{buildroot}%{_mandir}/man1
 install -p -m 644 man/*.5 %{buildroot}%{_mandir}/man5
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -p -m 644 files/fail2ban-logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fail2ban
-install -d -m 0755 %{buildroot}%{_localstatedir}/run/fail2ban/
+install -d -m 0755 %{buildroot}/run/fail2ban/
 install -d -m 0755 %{buildroot}%{_localstatedir}/lib/fail2ban/
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -p -m 0644 files/fail2ban-tmpfiles.conf %{buildroot}%{_tmpfilesdir}/fail2ban.conf
@@ -241,17 +249,20 @@ fi
 
 %files server
 %doc README.md TODO ChangeLog COPYING doc/*.txt
-%{_bindir}/fail2ban-server
 %{_bindir}/fail2ban-client
 %{_bindir}/fail2ban-regex
-%{_bindir}/fail2ban-testcases
+%{_bindir}/fail2ban-server
 %{python3_sitelib}/*
+%exclude %{python3_sitelib}/fail2ban/tests
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/fail2ban.service
 %else
 %{_initddir}/fail2ban
 %endif
-%{_mandir}/man1/fail2ban*.1*
+%{_mandir}/man1/fail2ban.1*
+%{_mandir}/man1/fail2ban-client.1*
+%{_mandir}/man1/fail2ban-regex.1*
+%{_mandir}/man1/fail2ban-server.1*
 %{_mandir}/man5/*.5*
 %config(noreplace) %{_sysconfdir}/fail2ban
 %exclude %{_sysconfdir}/fail2ban/action.d/complain.conf
@@ -263,7 +274,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/fail2ban
 %{_tmpfilesdir}/fail2ban.conf
 %dir %{_localstatedir}/lib/fail2ban/
-%dir %{_localstatedir}/run/fail2ban/
+%ghost %dir /run/fail2ban/
 
 %files all
 
@@ -273,6 +284,11 @@ fi
 %files hostsdeny
 %config(noreplace) %{_sysconfdir}/fail2ban/action.d/hostsdeny.conf
 
+%files tests
+%{_bindir}/fail2ban-testcases
+%{_mandir}/man1/fail2ban-testcases.1*
+%{python3_sitelib}/fail2ban/tests
+
 %files mail
 %config(noreplace) %{_sysconfdir}/fail2ban/action.d/complain.conf
 %config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail-*.conf
@@ -288,6 +304,11 @@ fi
 
 
 %changelog
+* Fri Oct 7 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-4
+- %%ghost /run/fail2ban
+- Fix typo in shorewall description
+- Move tests to -tests sub-package
+
 * Mon Oct 3 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-3
 - Add journalmatch entries for sendmail (bug #1329919)