diff --git a/tests/test_opening.py b/tests/test_opening.py
index a31e324e8..55a4a1423 100644
--- a/tests/test_opening.py
+++ b/tests/test_opening.py
@@ -15,8 +15,8 @@ def find_next_feerate(node, peer):
     return chan['next_feerate']
 
 
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_multifunding_v2_best_effort(node_factory, bitcoind):
     '''
     Check that best_effort flag works.
@@ -100,7 +100,7 @@ def test_multifunding_v2_best_effort(node_factory, bitcoind):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_v2_open_sigs_restart(node_factory, bitcoind):
     disconnects_1 = ['-WIRE_TX_SIGNATURES']
     disconnects_2 = ['+WIRE_TX_SIGNATURES']
@@ -145,7 +145,7 @@ def test_v2_open_sigs_restart(node_factory, bitcoind):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_v2_open_sigs_restart_while_dead(node_factory, bitcoind):
     # Same thing as above, except the transaction mines
     # while we're asleep
@@ -353,7 +353,7 @@ def test_v2_rbf_multi(node_factory, bitcoind, chainparams):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_rbf_reconnect_init(node_factory, bitcoind, chainparams):
     disconnects = ['-WIRE_INIT_RBF',
                    '@WIRE_INIT_RBF',
@@ -405,7 +405,7 @@ def test_rbf_reconnect_init(node_factory, bitcoind, chainparams):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_rbf_reconnect_ack(node_factory, bitcoind, chainparams):
     disconnects = ['-WIRE_ACK_RBF',
                    '@WIRE_ACK_RBF',
@@ -457,7 +457,7 @@ def test_rbf_reconnect_ack(node_factory, bitcoind, chainparams):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
-@unittest.skipIf(not DEVELOPER, "disconnect=... needs DEVELOPER=1")
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):
     disconnects = ['=WIRE_TX_ADD_INPUT',  # Initial funding succeeds
                    '-WIRE_TX_ADD_INPUT',
@@ -525,6 +525,7 @@ def test_rbf_reconnect_tx_construct(node_factory, bitcoind, chainparams):
 
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
+@unittest.skipIf(not DEVELOPER, "uses dev-disconnect")
 def test_rbf_reconnect_tx_sigs(node_factory, bitcoind, chainparams):
     disconnects = ['=WIRE_TX_SIGNATURES',  # Initial funding succeeds
                    '-WIRE_TX_SIGNATURES',  # When we send tx-sigs, RBF