diff --git a/data/hooks/diagnosis/50-systemresources.py b/data/hooks/diagnosis/50-systemresources.py
index 00e5ee84a..a9ed5b424 100644
--- a/data/hooks/diagnosis/50-systemresources.py
+++ b/data/hooks/diagnosis/50-systemresources.py
@@ -118,7 +118,7 @@ class SystemResourcesDiagnoser(Diagnoser):
 
         def analyzed_kern_log():
 
-            cmd = 'tail -n 10000 /var/log/kern.log | grep "oom_reaper: reaped process"'
+            cmd = 'tail -n 10000 /var/log/kern.log | grep "oom_reaper: reaped process" || true'
             out = subprocess.check_output(cmd, shell=True)
             lines = out.strip().split("\n")
 
diff --git a/src/yunohost/tests/test_backuprestore.py b/src/yunohost/tests/test_backuprestore.py
index d07ebff01..3699db565 100644
--- a/src/yunohost/tests/test_backuprestore.py
+++ b/src/yunohost/tests/test_backuprestore.py
@@ -62,7 +62,7 @@ def setup_function(function):
 
     if "with_permission_app_installed" in markers:
         assert not app_is_installed("permissions_app")
-        user_create("alice", "Alice", "White", "alice@" + maindomain, "test123Ynh")
+        user_create("alice", "Alice", "White", maindomain, "test123Ynh")
         install_app("permissions_app_ynh", "/urlpermissionapp"
                     "&admin=alice")
         assert app_is_installed("permissions_app")
diff --git a/src/yunohost/tests/test_permission.py b/src/yunohost/tests/test_permission.py
index abb289fad..1055089e0 100644
--- a/src/yunohost/tests/test_permission.py
+++ b/src/yunohost/tests/test_permission.py
@@ -55,9 +55,9 @@ def setup_function(function):
             return res
     socket.getaddrinfo = new_getaddrinfo
 
-    user_create("alice", "Alice", "White", "alice@" + maindomain, dummy_password)
-    user_create("bob", "Bob", "Snow", "bob@" + maindomain, dummy_password)
-    permission_create("wiki.main", url="/", allowed=["all_users"], sync_perm=False)
+    user_create("alice", "Alice", "White", maindomain, dummy_password)
+    user_create("bob", "Bob", "Snow", maindomain, dummy_password)
+    permission_create("wiki.main", url="/", allowed=["all_users"] , sync_perm=False)
     permission_create("blog.main", allowed=["all_users"], sync_perm=False)
     user_permission_update("blog.main", remove="all_users", add="alice")