diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index d047650e4..241797405 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -815,7 +815,7 @@ static struct feature_set *default_features(const tal_t *ctx)
 		OPTIONAL_FEATURE(OPT_DATA_LOSS_PROTECT),
 		OPTIONAL_FEATURE(OPT_UPFRONT_SHUTDOWN_SCRIPT),
 		OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES),
-		OPTIONAL_FEATURE(OPT_VAR_ONION),
+		COMPULSORY_FEATURE(OPT_VAR_ONION),
 		COMPULSORY_FEATURE(OPT_PAYMENT_SECRET),
 		OPTIONAL_FEATURE(OPT_BASIC_MPP),
 		OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX),
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 219739b48..376a68a17 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1784,7 +1784,7 @@ def test_list_features_only(node_factory):
     expected = ['option_data_loss_protect/odd',
                 'option_upfront_shutdown_script/odd',
                 'option_gossip_queries/odd',
-                'option_var_onion_optin/odd',
+                'option_var_onion_optin/even',
                 'option_gossip_queries_ex/odd',
                 'option_static_remotekey/odd',
                 'option_payment_secret/even',
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index bde2da4e7..c6b0b15bb 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -1548,7 +1548,7 @@ def test_plugin_feature_announce(node_factory):
 
     # Check the featurebits we've set in the `init` message from
     # feature-test.py.
-    assert l1.daemon.is_in_log(r'\[OUT\] 001000022200....{}'
+    assert l1.daemon.is_in_log(r'\[OUT\] 001000022100....{}'
                                .format(expected_peer_features(extra=[201] + extra)))
 
     # Check the invoice featurebit we set in feature-test.py
diff --git a/tests/utils.py b/tests/utils.py
index 141a27b50..e56b7d6ac 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -25,7 +25,7 @@ def hex_bits(features):
 
 def expected_peer_features(wumbo_channels=False, extra=[]):
     """Return the expected peer features hexstring for this configuration"""
-    features = [1, 5, 7, 9, 11, 13, 14, 17, 27]
+    features = [1, 5, 7, 8, 11, 13, 14, 17, 27]
     if EXPERIMENTAL_FEATURES:
         # OPT_ONION_MESSAGES
         features += [39]
@@ -47,7 +47,7 @@ def expected_peer_features(wumbo_channels=False, extra=[]):
 # features for the 'node' and the 'peer' feature sets
 def expected_node_features(wumbo_channels=False, extra=[]):
     """Return the expected node features hexstring for this configuration"""
-    features = [1, 5, 7, 9, 11, 13, 14, 17, 27, 55]
+    features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 55]
     if EXPERIMENTAL_FEATURES:
         # OPT_ONION_MESSAGES
         features += [39]