diff --git a/slurm.changes b/slurm.changes
index df34ade..4ae2788 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar  1 17:18:41 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Add missing Provides: and Obsoletes: to slurm-cray, slurm-hdf5
+  and slurm-testsuite to avoid package conflicts.
+- Add dependency for the general plugin package to the
+  AcctGatherProfile HDF5 plugin.
+- Adjust node RealMemory in slurm.conf of test suite for 8G test
+  nodes.
+
 -------------------------------------------------------------------
 Mon Feb 20 20:45:59 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 2af566b..5e1e123 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -426,6 +426,7 @@ Summary:        SLURM ext_sensors/rrd Plugin (loadable shared objects)
 Group:          Productivity/Clustering/Computing
 %{?upgrade:Provides: %{pname}-plugin-ext-sensors-rrd = %{version}}
 %{?upgrade:Conflicts: %{pname}-plugin-ext-sensors-rrd}
+Conflicts:      %{pname}-plugins < %version
 Requires:       %{name}-plugins = %{version}
 
 %description plugin-ext-sensors-rrd
@@ -581,6 +582,9 @@ Man pages for the SLURM cluster managment software config files.
 %package hdf5
 Summary:        Store accounting data in hdf5
 Group:          Productivity/Clustering/Computing
+%{?upgrade:Obsoletes:      %{pname}-hdf5 < %{version}}
+%{?upgrade:Provides:       %{pname}-hdf5 = %{version}}
+Requires:       %{name}-plugins = %version
 
 %description hdf5
 Plugin to store accounting in the hdf5 file format. This plugin has to be
@@ -590,6 +594,8 @@ sh5utils to merge this hdf5 files or extract data from them.
 %package cray
 Summary:        Cray specific plugins
 Group:          Productivity/Clustering/Computing
+%{?upgrade:Obsoletes:      %{pname}-cray < %{version}}
+%{?upgrade:Provides:       %{pname}-cray = %{version}}
 
 %description cray
 Plugins for specific cray hardware, includes power and knl node management.
@@ -601,6 +607,8 @@ Contains also cray specific documentation.
 %package testsuite
 Summary:        Regression tests from Slurm sources
 Group:          Productivity/Clustering/Computing
+%{?upgrade:Obsoletes:      %{pname}-testsuite < %{version}}
+%{?upgrade:Provides:       %{pname}-testsuite = %{version}}
 Requires:       %{name} = %version
 Requires:       %{name}-auth-none = %version
 Requires:       %{name}-cray = %version
diff --git a/test_setup.tar.gz b/test_setup.tar.gz
index 6c7c179..9d7cd2c 100644
--- a/test_setup.tar.gz
+++ b/test_setup.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecf47b27b894b01e983e0fc5ad1b782f475d6dcd51408c47aea1b491186289ec
-size 3136
+oid sha256:b4671bc0199a35d4a1566524e64849bc0b98b46dd14e4e9097f3a860a1c13f2d
+size 3093