diff --git a/src/bin/daemon.rs b/src/bin/daemon.rs
index 0856cfb7..3c5c5d8e 100644
--- a/src/bin/daemon.rs
+++ b/src/bin/daemon.rs
@@ -19,10 +19,7 @@ fn parse_args(args: Vec<String>) -> Option<PathBuf> {
         return None;
     }
 
-    let is_help = args
-        .iter()
-        .any(|arg| arg.contains("help") || arg.contains("-h"));
-    if args.len() != 3 || is_help {
+    if args.len() != 3 {
         print_help_exit();
     }
 
diff --git a/tests/test_framework/lianad.py b/tests/test_framework/lianad.py
index 30fb4c94..eb273c31 100644
--- a/tests/test_framework/lianad.py
+++ b/tests/test_framework/lianad.py
@@ -127,6 +127,9 @@ class Lianad(TailableProc):
     def stop(self, timeout=5):
         try:
             self.rpc.stop()
+            self.wait_for_log(
+                "Stopping the liana daemon.",
+            )
             self.proc.wait(timeout)
         except Exception as e:
             logging.error(f"{self.prefix} : error when calling stop: '{e}'")