diff --git a/src/tests/test_domains.py b/src/tests/test_domains.py
index 13a9f63b8..273b8689a 100644
--- a/src/tests/test_domains.py
+++ b/src/tests/test_domains.py
@@ -147,21 +147,19 @@ def test_change_main_domain():
 
 # Domain settings testing
 def test_domain_config_get_default():
-    assert domain_config_get(TEST_DOMAINS[0], "feature.xmpp.xmpp") == 1
-    assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 0
+    assert domain_config_get(TEST_DOMAINS[0], "feature.mail.mail_out") == 1
 
 
 def test_domain_config_get_export():
-    assert domain_config_get(TEST_DOMAINS[0], export=True)["xmpp"] == 1
-    assert domain_config_get(TEST_DOMAINS[1], export=True)["xmpp"] == 0
+    assert domain_config_get(TEST_DOMAINS[0], export=True)["mail_out"] == 1
 
 
 def test_domain_config_set():
-    assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 0
-    domain_config_set(TEST_DOMAINS[1], "feature.xmpp.xmpp", "yes")
-    assert domain_config_get(TEST_DOMAINS[1], "feature.xmpp.xmpp") == 1
+    assert domain_config_get(TEST_DOMAINS[1], "feature.mail.mail_out") == 1
+    domain_config_set(TEST_DOMAINS[1], "feature.mail.mail_out", "no")
+    assert domain_config_get(TEST_DOMAINS[1], "feature.mail.mail_out") == 0
 
 
 def test_domain_configs_unknown():
     with pytest.raises(YunohostError):
-        domain_config_get(TEST_DOMAINS[2], "feature.xmpp.xmpp.xmpp")
+        domain_config_get(TEST_DOMAINS[2], "feature.foo.bar.baz")
diff --git a/src/tests/test_permission.py b/src/tests/test_permission.py
index 214817c5d..17a1993ff 100644
--- a/src/tests/test_permission.py
+++ b/src/tests/test_permission.py
@@ -338,7 +338,7 @@ def check_LDAP_db_integrity():
 def check_permission_for_apps():
     # We check that the for each installed apps we have at last the "main" permission
     # and we don't have any permission linked to no apps. The only exception who is not liked to an app
-    # is mail, xmpp, and sftp
+    # is mail, and sftp
 
     app_perms = user_permission_list(ignore_system_perms=True)["permissions"].keys()
 
@@ -397,7 +397,6 @@ def test_permission_list():
     res = user_permission_list(full=True)["permissions"]
 
     assert "mail.main" in res
-    assert "xmpp.main" in res
 
     assert "wiki.main" in res
     assert "blog.main" in res
@@ -615,7 +614,6 @@ def test_permission_delete_doesnt_existing(mocker):
     assert "wiki.main" in res
     assert "blog.main" in res
     assert "mail.main" in res
-    assert "xmpp.main" in res
 
 
 def test_permission_delete_main_without_force(mocker):