diff --git a/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties b/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
index efbc7a2436cef4fc70f330b1679af7097942aa9c..55e6843f83129200af5d0f402e30a3347f433ef9 100644
--- a/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
+++ b/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
@@ -2,6 +2,7 @@ class = ch.systemsx.cisd.etlserver.plugins.AutoArchiverTask
 interval = 20
 remove-datasets-from-store = true
 older-than = 1
-policy.class = ch.systemsx.cisd.etlserver.plugins.ByExperimentPolicy
+policy.class = ch.systemsx.cisd.etlserver.plugins.GroupingPolicy
 policy.minimal-archive-size = 1500000
 policy.maximal-archive-size = 2500000
+policy.grouping-keys = DataSetType#Experiment, DataSetType#Project:merge
diff --git a/integration-tests/test_multi_data_set_archiving.py b/integration-tests/test_multi_data_set_archiving.py
index ea36a77d1353f14404f6fc2339114996f80c6e81..652da79fdff1cc47d3e194392dbcdaa0bf0f4a74 100755
--- a/integration-tests/test_multi_data_set_archiving.py
+++ b/integration-tests/test_multi_data_set_archiving.py
@@ -242,6 +242,7 @@ class TestCase(systemtest.testcase.TestCase):
     def _createArchivingMonitor(self, openbisController):
         monitor = openbisController.createLogMonior()
         monitor.addNotificationCondition(util.RegexCondition('OPERATION.AutoArchiverTask'))
+        monitor.addNotificationCondition(util.RegexCondition('GroupingPolicy'))
         monitor.addNotificationCondition(util.RegexCondition('OPERATION.MultiDataSet'))
         monitor.addNotificationCondition(util.RegexCondition('OPERATION.FileDeleter'))
         monitor.addNotificationCondition(util.RegexCondition('OPERATION.DataSetCommandExecutor'))