diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index 4fe9d1a16..691e21344 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -893,7 +893,7 @@ static struct feature_set *default_features(const tal_t *ctx)
 	static const u32 features[] = {
 		COMPULSORY_FEATURE(OPT_DATA_LOSS_PROTECT),
 		OPTIONAL_FEATURE(OPT_UPFRONT_SHUTDOWN_SCRIPT),
-		COMPULSORY_FEATURE(OPT_GOSSIP_QUERIES),
+		OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES),
 		COMPULSORY_FEATURE(OPT_VAR_ONION),
 		COMPULSORY_FEATURE(OPT_PAYMENT_SECRET),
 		OPTIONAL_FEATURE(OPT_BASIC_MPP),
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 37d2c023c..82efe820f 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -2263,7 +2263,7 @@ def test_list_features_only(node_factory):
                                         '--list-features-only']).decode('utf-8').splitlines()
     expected = ['option_data_loss_protect/even',
                 'option_upfront_shutdown_script/odd',
-                'option_gossip_queries/even',
+                'option_gossip_queries/odd',
                 'option_var_onion_optin/even',
                 'option_gossip_queries_ex/odd',
                 'option_static_remotekey/even',
diff --git a/tests/utils.py b/tests/utils.py
index 6a109b809..001cbec81 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -36,7 +36,7 @@ def hex_bits(features):
 
 def expected_peer_features(extra=[]):
     """Return the expected peer features hexstring for this configuration"""
-    features = [0, 5, 6, 8, 11, 12, 14, 17, 19, 25, 27, 45, 47, 51]
+    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 25, 27, 45, 47, 51]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]
@@ -53,7 +53,7 @@ def expected_peer_features(extra=[]):
 # features for the 'node' and the 'peer' feature sets
 def expected_node_features(extra=[]):
     """Return the expected node features hexstring for this configuration"""
-    features = [0, 5, 6, 8, 11, 12, 14, 17, 19, 25, 27, 45, 47, 51, 55]
+    features = [0, 5, 7, 8, 11, 12, 14, 17, 19, 25, 27, 45, 47, 51, 55]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]