diff --git a/lightningd/json.c b/lightningd/json.c
index 4b790761d..d074c0294 100644
--- a/lightningd/json.c
+++ b/lightningd/json.c
@@ -1,6 +1,7 @@
 #include <arpa/inet.h>
 #include <bitcoin/address.h>
 #include <bitcoin/base58.h>
+#include <bitcoin/feerate.h>
 #include <bitcoin/script.h>
 #include <ccan/json_escape/json_escape.h>
 #include <ccan/mem/mem.h>
@@ -159,6 +160,8 @@ struct command_result *param_feerate(struct command *cmd, const char *name,
 
 	*feerate = tal(cmd, u32);
 	**feerate = feerate_from_style(num, style);
+	if (**feerate < FEERATE_FLOOR)
+		**feerate = FEERATE_FLOOR;
 	return NULL;
 }
 
diff --git a/tests/test_wallet.py b/tests/test_wallet.py
index 66cc76223..e3a982b17 100644
--- a/tests/test_wallet.py
+++ b/tests/test_wallet.py
@@ -15,7 +15,6 @@ import time
 import unittest
 
 
-@pytest.mark.xfail(strict=True)
 @unittest.skipIf(TEST_NETWORK != 'regtest', "Test relies on a number of example addresses valid only in regtest")
 def test_withdraw(node_factory, bitcoind):
     amount = 1000000