diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index 2895014529fb..b8e2bb2a919c 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -880,7 +880,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),
-		OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES),
+		COMPULSORY_FEATURE(OPT_GOSSIP_QUERIES),
 		COMPULSORY_FEATURE(OPT_VAR_ONION),
 		COMPULSORY_FEATURE(OPT_PAYMENT_SECRET),
 		OPTIONAL_FEATURE(OPT_BASIC_MPP),
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 2f318e876467..9a774c2a6191 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -3577,9 +3577,9 @@ def test_nonstatic_channel(node_factory, bitcoind):
     """Smoke test for a channel without option_static_remotekey"""
     l1, l2 = node_factory.line_graph(2,
                                      opts=[{},
-                                           # needs at least 1 and 15 to connect
+                                           # needs at least 1, 7 and 15 to connect
                                            # (and 9 is a dependent)
-                                           {'dev-force-features': '1,9,15////////'}])
+                                           {'dev-force-features': '1,7,9,15////////'}])
     chan = only_one(l1.rpc.listpeerchannels()['channels'])
     assert 'option_static_remotekey' not in chan['features']
     assert 'option_anchor' not in chan['features']
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 0289d0929c5a..f9da48f4b934 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -2245,7 +2245,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/odd',
+                'option_gossip_queries/even',
                 'option_var_onion_optin/even',
                 'option_gossip_queries_ex/odd',
                 'option_static_remotekey/odd',
diff --git a/tests/utils.py b/tests/utils.py
index 8810b79ef4fc..ab84dfff8b1c 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, 7, 8, 11, 13, 14, 17, 19, 25, 27, 45, 47, 51]
+    features = [0, 5, 6, 8, 11, 13, 14, 17, 19, 25, 27, 45, 47, 51]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]
@@ -50,7 +50,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, 7, 8, 11, 13, 14, 17, 19, 25, 27, 45, 47, 51, 55]
+    features = [0, 5, 6, 8, 11, 13, 14, 17, 19, 25, 27, 45, 47, 51, 55]
     if EXPERIMENTAL_DUAL_FUND:
         # option_dual_fund
         features += [29]