diff --git a/itest/list_on_test.go b/itest/list_on_test.go
index cc735afad..0de448027 100644
--- a/itest/list_on_test.go
+++ b/itest/list_on_test.go
@@ -13,34 +13,10 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "basic funding flow",
 		TestFunc: testBasicChannelFunding,
 	},
-	{
-		Name:     "multi hop htlc local timeout",
-		TestFunc: testMultiHopHtlcLocalTimeout,
-	},
 	{
 		Name:     "multi hop receiver chain claim",
 		TestFunc: testMultiHopReceiverChainClaim,
 	},
-	{
-		Name:     "multi hop local force close on-chain htlc timeout",
-		TestFunc: testMultiHopLocalForceCloseOnChainHtlcTimeout,
-	},
-	{
-		Name:     "multi hop remote force close on-chain htlc timeout",
-		TestFunc: testMultiHopRemoteForceCloseOnChainHtlcTimeout,
-	},
-	{
-		Name:     "multi hop htlc local chain claim",
-		TestFunc: testMultiHopHtlcLocalChainClaim,
-	},
-	{
-		Name:     "multi hop htlc remote chain claim",
-		TestFunc: testMultiHopHtlcRemoteChainClaim,
-	},
-	{
-		Name:     "multi hop htlc aggregation",
-		TestFunc: testMultiHopHtlcAggregation,
-	},
 	{
 		Name:     "external channel funding",
 		TestFunc: testExternalFundingChanPoint,
@@ -145,14 +121,6 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "send update disable channel",
 		TestFunc: testSendUpdateDisableChannel,
 	},
-	{
-		Name:     "private channel update policy",
-		TestFunc: testUpdateChannelPolicyForPrivateChannel,
-	},
-	{
-		Name:     "update channel policy fee rate accuracy",
-		TestFunc: testUpdateChannelPolicyFeeRateAccuracy,
-	},
 	{
 		Name:     "connection timeout",
 		TestFunc: testNetworkConnectionTimeout,
@@ -165,6 +133,26 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "addpeer config",
 		TestFunc: testAddPeerConfig,
 	},
+	{
+		Name:     "multi hop htlc local timeout",
+		TestFunc: testMultiHopHtlcLocalTimeout,
+	},
+	{
+		Name:     "multi hop local force close on-chain htlc timeout",
+		TestFunc: testMultiHopLocalForceCloseOnChainHtlcTimeout,
+	},
+	{
+		Name:     "multi hop remote force close on-chain htlc timeout",
+		TestFunc: testMultiHopRemoteForceCloseOnChainHtlcTimeout,
+	},
+	{
+		Name:     "private channel update policy",
+		TestFunc: testUpdateChannelPolicyForPrivateChannel,
+	},
+	{
+		Name:     "update channel policy fee rate accuracy",
+		TestFunc: testUpdateChannelPolicyFeeRateAccuracy,
+	},
 	{
 		Name:     "unannounced channels",
 		TestFunc: testUnannouncedChannels,
@@ -297,6 +285,18 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "REST API",
 		TestFunc: testRestAPI,
 	},
+	{
+		Name:     "multi hop htlc local chain claim",
+		TestFunc: testMultiHopHtlcLocalChainClaim,
+	},
+	{
+		Name:     "multi hop htlc remote chain claim",
+		TestFunc: testMultiHopHtlcRemoteChainClaim,
+	},
+	{
+		Name:     "multi hop htlc aggregation",
+		TestFunc: testMultiHopHtlcAggregation,
+	},
 	{
 		Name:     "revoked uncooperative close retribution",
 		TestFunc: testRevokedCloseRetribution,