diff --git a/tests/test_misc.py b/tests/test_misc.py
index c0f551ceabb8..86caa9f65e91 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1171,9 +1171,9 @@ def test_cli_multiline_help(node_factory):
                                    '--lightning-dir={}'
                                    .format(l1.daemon.lightning_dir),
                                    'help', 'helpme']).decode('utf-8')
-    assert out == ("helpme msat  \n"
-                   " This is a message which consumes multiple lines and thus should\n"
-                   " be well-formatted by lightning-cli help\n")
+    assert ("helpme msat  \n"
+            " This is a message which consumes multiple lines and thus should\n"
+            " be well-formatted by lightning-cli help\n" in out)
 
 
 def test_cli_commando(node_factory):
@@ -4377,6 +4377,7 @@ def test_setconfig(node_factory, bitcoind):
         assert lines == ["# Created and update by setconfig, but you can edit this manually when node is stopped.", "min-capacity-sat=400000"]
 
 
+@pytest.mark.skipif(os.getuid() == 0, reason="Test requires non-root user for permission checks to work")
 def test_setconfig_access(node_factory, bitcoind):
     """Test that we correctly fail (not crash) if config file/dir not writable"""
 
diff --git a/tests/test_xpay.py b/tests/test_xpay.py
index ff7179c888dd..d1f3dc7d4232 100644
--- a/tests/test_xpay.py
+++ b/tests/test_xpay.py
@@ -646,6 +646,7 @@ def test_xpay_no_mpp(node_factory, chainparams):
                                           f"p={no_mpp['payment_hash']}",
                                           f"s={no_mpp['payment_secret']}",
                                           f"d=Paying l3 without mpp",
+                                          "9=4000",  # Include payment_secret (bit 14) but not basic_mpp (bit 16)
                                           f"amount={AMOUNT}"]).decode('utf-8').strip()
 
     # This should not mpp!