diff --git a/pkg/mcp/tool_middleware_test.go b/pkg/mcp/tool_middleware_test.go
index 3de2ec3fc..2f12247ff 100644
--- a/pkg/mcp/tool_middleware_test.go
+++ b/pkg/mcp/tool_middleware_test.go
@@ -483,7 +483,12 @@ func TestNewListToolsMappingMiddleware_SSE_Scenarios(t *testing.T) {
 			// Verify results
 			assert.Equal(t, "2.0", response.JSONRPC)
 			assert.Equal(t, float64(1), response.ID)
-			assert.Equal(t, tt.expected, response.Result.Tools)
+			// Use ElementsMatch for order-independent comparison of tools
+			if tt.expected != nil && response.Result.Tools != nil {
+				assert.ElementsMatch(t, *tt.expected, *response.Result.Tools, "Tools should match regardless of order")
+			} else {
+				assert.Equal(t, tt.expected, response.Result.Tools)
+			}
 		})
 	}
 }