diff --git a/server/mqtt_ex_test_test.go b/server/mqtt_ex_test_test.go
index 5e86d9645ae..2d1e822b480 100644
--- a/server/mqtt_ex_test_test.go
+++ b/server/mqtt_ex_test_test.go
@@ -79,30 +79,10 @@ func TestXMQTTRetainedMessages(t *testing.T) {
 			name:  "single server",
 			makef: mqttMakeTestServer,
 		},
-		// {
-		// 	name:  "server with leafnode",
-		// 	makef: mqttMakeTestServerWithLeafnode("HUBD", "LEAFD", true),
-		// },
-		// {
-		// 	name:  "server with leafnode no domains",
-		// 	makef: mqttMakeTestServerWithLeafnode("", "", true),
-		// },
-		// {
-		// 	name:  "server with leafnode no system account",
-		// 	makef: mqttMakeTestServerWithLeafnode("HUBD", "LEAFD", false),
-		// },
 		{
 			name:  "cluster",
 			makef: mqttMakeTestCluster(4, ""),
 		},
-		// {
-		// 	name:  "cluster with leafnode cluster",
-		// 	makef: mqttMakeTestClusterWithLeafnodeCluster("HUBD", "LEAFD", true),
-		// },
-		// {
-		// 	name:  "cluster with leafnode cluster no system account",
-		// 	makef: mqttMakeTestClusterWithLeafnodeCluster("HUBD", "LEAFD", false),
-		// },
 	} {
 		t.Run(topo.name, func(t *testing.T) {
 			target := topo.makef(t)