diff --git a/common/features.c b/common/features.c
index 2ea1c0403..681fdc334 100644
--- a/common/features.c
+++ b/common/features.c
@@ -86,12 +86,10 @@ static const struct feature_style feature_styles[] = {
 			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT,
 			  [BOLT11_FEATURE] = FEATURE_REPRESENT,
 			  [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT} },
-#if EXPERIMENTAL_FEATURES
 	{ OPT_SHUTDOWN_ANYSEGWIT,
 	  .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT,
 			  [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT,
 			  [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT } },
-#endif
 };
 
 struct dependency {
diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c
index 4ae921963..ca9a1ae97 100644
--- a/lightningd/lightningd.c
+++ b/lightningd/lightningd.c
@@ -802,10 +802,10 @@ static struct feature_set *default_features(const tal_t *ctx)
 		OPTIONAL_FEATURE(OPT_BASIC_MPP),
 		OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX),
 		OPTIONAL_FEATURE(OPT_STATIC_REMOTEKEY),
+		OPTIONAL_FEATURE(OPT_SHUTDOWN_ANYSEGWIT),
 #if EXPERIMENTAL_FEATURES
 		OPTIONAL_FEATURE(OPT_ANCHOR_OUTPUTS),
 		OPTIONAL_FEATURE(OPT_ONION_MESSAGES),
-		OPTIONAL_FEATURE(OPT_SHUTDOWN_ANYSEGWIT),
 #endif
 	};
 
diff --git a/tests/test_closing.py b/tests/test_closing.py
index cc34894bc..9638ce859 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -6,7 +6,7 @@ from pyln.testing.utils import SLOW_MACHINE
 from utils import (
     only_one, sync_blockheight, wait_for, TIMEOUT,
     account_balance, first_channel_id, basic_fee, TEST_NETWORK,
-    EXPERIMENTAL_FEATURES, scriptpubkey_addr
+    scriptpubkey_addr
 )
 
 import os
@@ -2659,15 +2659,8 @@ Try a range of future segwit versions as shutdown scripts.  We create many nodes
     else:
         valid = edge_valid + other_valid
 
-    if EXPERIMENTAL_FEATURES:
-        xsuccess = valid
-        xfail = invalid
-    else:
-        xsuccess = []
-        xfail = valid + invalid
-
     # More efficient to create them all up-front.
-    nodes = node_factory.get_nodes(len(xfail) + len(xsuccess))
+    nodes = node_factory.get_nodes(len(valid) + len(invalid))
 
     # Give it one UTXO to spend for each node.
     addresses = {}
@@ -2680,7 +2673,7 @@ Try a range of future segwit versions as shutdown scripts.  We create many nodes
     # FIXME: Since we don't support other non-v0 encodings, we need a protocol
     # test for this (we're actually testing our upfront check, not the real
     # shutdown one!),
-    for script in xsuccess:
+    for script in valid:
         # Insist on upfront script we're not going to match.
         l1.stop()
         l1.daemon.env["DEV_OPENINGD_UPFRONT_SHUTDOWN_SCRIPT"] = script
@@ -2690,7 +2683,7 @@ Try a range of future segwit versions as shutdown scripts.  We create many nodes
         l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
         l1.rpc.fundchannel(l2.info['id'], 10**6)
 
-    for script in xfail:
+    for script in invalid:
         # Insist on upfront script we're not going to match.
         l1.stop()
         l1.daemon.env["DEV_OPENINGD_UPFRONT_SHUTDOWN_SCRIPT"] = script
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 14692bc2d..e3ebd5685 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1898,6 +1898,8 @@ def test_list_features_only(node_factory):
         expected += ['option_anchor_outputs/odd']
         expected += ['option_shutdown_anysegwit/odd']
         expected += ['option_onion_messages/odd']
+    else:
+        expected += ['option_shutdown_anysegwit/odd']
     assert features == expected
 
 
diff --git a/tests/utils.py b/tests/utils.py
index 2c0e08840..de1a7060c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -20,14 +20,12 @@ 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, 15, 17]
+    features = [1, 5, 7, 9, 11, 13, 15, 17, 27]
     if EXPERIMENTAL_FEATURES:
         # OPT_ONION_MESSAGES
         features += [103]
         # option_anchor_outputs
         features += [21]
-        # option_shutdown_anysegwit
-        features += [27]
     if wumbo_channels:
         features += [19]
     if EXPERIMENTAL_DUAL_FUND:
@@ -42,14 +40,12 @@ 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, 15, 17, 55]
+    features = [1, 5, 7, 9, 11, 13, 15, 17, 27, 55]
     if EXPERIMENTAL_FEATURES:
         # OPT_ONION_MESSAGES
         features += [103]
         # option_anchor_outputs
         features += [21]
-        # option_shutdown_anysegwit
-        features += [27]
     if wumbo_channels:
         features += [19]
     if EXPERIMENTAL_DUAL_FUND: