diff --git a/sources b/sources
index 7b07855..e761f28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-5.8.3.tar.gz) = 4b5e03e4ffc088fe2a13a29dcc03e276df3664a5df95a8d8f0166cea98065508a1aef3499f7f0f3cb0d63880e1a3e88308bc20fc7eeb98b1e4672ebf0b5cefd2
+SHA512 (xrootd-5.8.4.tar.gz) = e743f9ff190bf5df64a3aab29a02114255513a78c5cc71209a85be21a061c8fae35240e53325888b074bd5494ba23da3334be8fe222bc454ddb95fc9eca654d9
diff --git a/xrootd.spec b/xrootd.spec
index f00799a..65a357a 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -13,7 +13,7 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	5.8.3
+Version:	5.8.4
 Release:	1%{?dist}
 Summary:	Extended ROOT file server
 License:	LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib
@@ -378,11 +378,21 @@ export HOSTNAME=localhost
 adminpath=$(mktemp -d -p /var/tmp)
 sed "s!all.adminpath .*!all.adminpath ${adminpath}!" \
     -i %{_vpath_builddir}/tests/cluster/common.cfg \
+       %{_vpath_builddir}/tests/badredir/common.cfg \
        tests/XRootD/common.cfg
 
+# Use a separate directory for TPC test due to name clash (srv1, srv2)
+adminpath2=$(mktemp -d -p /var/tmp)
+sed "s!all.adminpath .*!all.adminpath ${adminpath2}!" \
+    -i %{_vpath_builddir}/tests/TPCTests/common.cfg
+
+trap "rm -rf ${adminpath} ${adminpath2}" EXIT
+
+# The badredir test fails when there is no network - exclude
+
 touch testfile
 if ( setfattr -n user.testattr -v testvalue testfile ) ; then
-    %ctest
+    %ctest -- -E XRootD::badredir
 else
     echo "Extended file attributes not supported by file system"
     echo "Don't run tests that require them"
@@ -397,15 +407,15 @@ XrdCl::ThreadingTest|\
 XrdCl::WorkflowTest.CheckpointTest|\
 XrdCl::WorkflowTest.XAttrWorkflowTest|\
 XrdEc::XrdEcTests|\
+XRootD::badredir|\
 XRootD::cluster::test|\
 XRootD::http::test|\
+XRootD::posix::test|\
 XRootD::tpc::test"
     %ctest -- -E $exclude
 fi
 rm testfile
 
-rm -rf ${adminpath}
-
 %pre server
 %sysusers_create_compat %{SOURCE1}
 
@@ -655,6 +665,9 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Sun Jul 13 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.8.4-1
+- Update to version 5.8.4
+
 * Fri Jun 06 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.8.3-1
 - Update to version 5.8.3