diff --git a/fboss/oss/hw_known_bad_tests/sai_known_bad_tests.materialized_JSON b/fboss/oss/hw_known_bad_tests/sai_known_bad_tests.materialized_JSON
index 51d3a7d542a8e..050bec9cb743f 100644
--- a/fboss/oss/hw_known_bad_tests/sai_known_bad_tests.materialized_JSON
+++ b/fboss/oss/hw_known_bad_tests/sai_known_bad_tests.materialized_JSON
@@ -3224,7 +3224,7 @@
           "test_name_regex": "HwAqmTest.verifyEcnTrafficNoDrop"
         }
     ],
-    "brcm/12.0_ea_dnx_odp/12.0_ea_dnx_odp/jericho3": [
+    "brcm/11.7.0.0_dnx_odp/12.0_ea_dnx_odp/jericho3": [
         {
           "test_name_regex": "SaiRouteRollbackTest.rollbackAllWithTrunk"
         },
@@ -3370,90 +3370,39 @@
           "test_name_regex": "HwAqmTest.verifyEcnTrafficNoDrop"
         }
     ],
-    "brcm/12.0_ea_dnx_odp/12.0_ea_dnx_odp/jericho3/simulator": [
-        {
-          "test_name_regex": "warm_boot.*"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestV[46].*Ucmp.*"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestsV[46]InMplsPhp.*"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestsV[46]InMplsSwap.*"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestV[46]ToMpls.*"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestV[46].ECMPShrinkExpandLoadBalance*"
-        },
-        {
-          "test_name_regex": "HwHashConsistencyTest.VerifyMemberOrderEffect"
-        },
-        {
-          "test_name_regex": "HwHashConsistencyTest.TcpEgressLinksOnEcmpExpand"
-        },
-        {
-          "test_name_regex": "HwHashConsistencyTest.UdpEgressLinksOnEcmpExpand"
-        },
-        {
-          "test_name_regex": "SaiPortAdminStateTest.assertAdminState"
-        },
-        {
-          "test_name_regex": "HwEcmpTest.Ucmp.*"
-        },
-        {
-          "test_name_regex": "HwRouteTest/[01].VerifyClassID*"
-        },
-        {
-          "test_name_regex": "HwRouteTest/[01].StaticIp2MplsRoutes"
-        },
-        {
-          "test_name_regex": "HwRouteTest/[01].VerifyClassIdWithNhopResolutionFlap"
-        },
-        {
-          "test_name_regex": "HwVerifyPfcConfigInHwTest.PfcWatchdog*"
-        },
-        {
-          "test_name_regex": "HwTrafficPfcTest.PfcWatchdog*"
-        },
-        {
-          "test_name_regex": "HwPacketFloodTest.ArpRequest*"
-        },
+    "brcm/12.0_ea_dnx_odp/12.0_ea_dnx_odp/jericho3": [
         {
-          "test_name_regex": "HwPacketFloodTest.Lldp*"
+          "test_name_regex": "SaiRouteRollbackTest.rollbackAllWithTrunk"
         },
         {
-          "test_name_regex": "HwPacketSendReceiveLagTest.LacpPacketReceiveSrcPort"
+          "test_name_regex": "SaiRouteRollbackTest.rollbackManyTimesWithTrunk"
         },
         {
-          "test_name_regex": "HwPacketFloodTest.NdpFloodTest"
+          "test_name_regex": "SaiQPHRollbackTest.*"
         },
         {
-          "test_name_regex": "HwAclStatTest/[01].*"
+          "test_name_regex": "HwOverflowTest.*"
         },
         {
-          "test_name_regex": "HwAclStatTest.*"
+          "test_name_regex": "HwProdInvariants.*"
         },
         {
-          "test_name_regex": "HwAclQualifierTest/[01].*"
+          "test_name_regex": "HwHashPolarizationTest*"
         },
         {
-          "test_name_regex": "HwAclQualifierTest.*"
+          "test_name_regex": "HwHashConsistencyTest.*"
         },
         {
-          "test_name_regex": "HwAclCounterTest/[01].*"
+          "test_name_regex": "HwIngressBufferTest.validateIngressPoolParamChange"
         },
         {
-          "test_name_regex": "HwAclMatchActionsTest/[01].*"
+          "test_name_regex": "HwIngressBufferTest.validatePGParamChange"
         },
         {
-          "test_name_regex": "HwAclMatchActionsTest.*"
+          "test_name_regex": "HwIngressBufferTest.validatePGQueueChanges"
         },
         {
-          "test_name_regex": "HwAclPriorityTest/[01].*"
+          "test_name_regex": "HwAclStatTest/[01].AclStatChangeCounterType"
         },
         {
           "test_name_regex": "SaiAclTableGroupTest.*"
@@ -3461,9 +3410,6 @@
         {
           "test_name_regex": "SaiAclTableGroupTrafficTest/[01].*"
         },
-        {
-          "test_name_regex": "SaiAclTableRecreateTests.*"
-        },
         {
           "test_name_regex": "HwResourceStatsTest/[01].aclStats"
         },
@@ -3471,161 +3417,50 @@
           "test_name_regex": "HwResourceStatsTest.aclStats"
         },
         {
-          "test_name_regex": "HwVoqSwitchTest.AclQualifiersWithCounter"
-        },
-        {
-          "test_name_regex": "HwTrunkLoadBalancerTest.*"
-        },
-        {
-          "test_name_regex": "HwSflowMirrorTest.*"
-        },
-        {
-          "test_name_regex": "HwSflowTest.*"
-        },
-        {
-          "test_name_regex": "HwPortBandwidthTest.*"
-        },
-        {
-          "test_name_regex": "HwMPLSTest/[01].*"
-        },
-        {
-          "test_name_regex": "HwMacLearningAndNeighborResolutionTest.*"
-        },
-        {
-          "test_name_regex": "HwMacSwLearningModeTest.*"
-        },
-        {
-          "test_name_regex": "HwMacLearningTest.*"
-        },
-        {
-          "test_name_regex": "HwMacLearningMacMoveTest.*"
-        },
-        {
-          "test_name_regex": "HwMacLearningStaticEntriesTest.*"
-        },
-        {
-          "test_name_regex": "HwMacLearningAndMyStationInteractionTest.*"
-        },
-        {
-          "test_name_regex": "HwIpInIpTunnelTest.*"
+          "test_name_regex": "HwAclQualifierTest/[01].*Tcp*"
         },
         {
-          "test_name_regex": "HwHashPolarizationTest*"
+          "test_name_regex": "HwAclQualifierTest/[01].*Icmp*"
         },
         {
-          "test_name_regex": "HwAqmTest.verifyEcnThreshold"
+          "test_name_regex": "HwAclQualifierTest/[01].*AclModifyQualifier"
         },
         {
-          "test_name_regex": "HwAqmTest.verifyEcnTrafficNoDrop"
+          "test_name_regex": "HwAclQualifierTest/[01].*AclIp4Qualifiers"
         },
         {
-          "test_name_regex": "HwAqmTest.verifyPerQueueWredDropStats"
+          "test_name_regex": "HwAclQualifierTest.*Tcp*"
         },
         {
-          "test_name_regex": "HwAqmTest.verifyWredDrop"
+          "test_name_regex": "HwAclQualifierTest.*Icmp*"
         },
         {
-          "test_name_regex": "HwAqmTest.verifyWredThreshold"
+          "test_name_regex": "HwAclQualifierTest.*AclModifyQualifier"
         },
         {
-          "test_name_regex": "HwTest_PROFILE*"
+          "test_name_regex": "HwSflowTest.*"
         },
         {
           "test_name_regex": "HwMirrorTest/[01].*"
         },
         {
-          "test_name_regex": "HwNeighborTest/[1357].*"
-        },
-        {
-          "test_name_regex": "HwNeighborTest/[01234567].ResolvePendingEntryThenChangeLookupClass"
-        },
-        {
-          "test_name_regex": "HwQueuePerHostRouteTest/[01].*"
-        },
-        {
-          "test_name_regex": "HwQueuePerHostTest/[0123].*"
-        },
-        {
-          "test_name_regex": "HwLabelSwitchRouteTest/[01].*"
-        },
-        {
-          "test_name_regex": "HwLabelEdgeRouteTest/[01].*"
-        },
-        {
-          "test_name_regex": "HwFlexPortTest.*"
-        },
-        {
-          "test_name_regex": "SaiRouteRollbackTest.rollbackManyTimesWithTrunk"
-        },
-        {
-          "test_name_regex": "SaiRouteRollbackTest.rollbackAllWithTrunk"
-        },
-        {
-          "test_name_regex": "SaiQPHRollbackTest.*"
-        },
-        {
-          "test_name_regex": "HwSwitchStateReplayTest.test"
-        },
-        {
-          "test_name_regex": "HwFabricSwitchTest.*"
-        },
-        {
-          "test_name_regex": "HwMacLearningBatchEntriesTest.*"
-        },
-        {
-          "test_name_regex": "HwDataPlaneMirrorTest/[01].*"
-        },
-        {
-          "test_name_regex": "HwMmuTuningTest.*"
-        },
-        {
-          "test_name_regex": "HwProdInvariants.*"
-        },
-        {
-          "test_name_regex": "HwHashTrunk.*"
-        },
-        {
-          "test_name_regex": "HwRouteCounterOverflowTest.*"
-        },
-        {
-          "test_name_regex": "HwWideEcmpTest.*"
+          "test_name_regex": "HwDataPlaneMirrorTest/[01].SpanAclMirror"
         },
         {
-          "test_name_regex": "HwEcmpTrunkTest.*"
+          "test_name_regex": "HwDataPlaneMirrorTest/[01].ErspanAclMirror"
         },
         {
-          "test_name_regex": "HwEmptyTest.*"
+          "test_name_regex": "HwDataPlaneMirrorTest/[01].TrucatePortErspanMirror"
         },
         {
-          "test_name_regex": "HwL2ClassIDTest.*"
+          "test_name_regex": "HwDataPlaneMirrorTest/[01].ErspanMirrorWithLagMember"
         },
         {
           "test_name_regex": "HwNeighborOnMultiplePortsTest.*"
         },
-        {
-          "test_name_regex": "HwPortLedTest.*"
-        },
-        {
-          "test_name_regex": "HwPortStressTest.*"
-        },
-        {
-          "test_name_regex": "HwPtpTcTest.*"
-        },
-        {
-          "test_name_regex": "HwTrunkTest.*"
-        },
-        {
-          "test_name_regex": "HwRouteScaleTest.*"
-        },
-        {
-          "test_name_regex": "HwUdfTest.*"
-        },
         {
           "test_name_regex": "HwRouteOverDifferentAddressFamilyNhopTest.*"
         },
-        {
-          "test_name_regex": "HwL3Test.*"
-        },
         {
           "test_name_regex": "HwLoadBalancerTestV6RoCE.*"
         },
@@ -3636,143 +3471,17 @@
           "test_name_regex": "HwLoadBalancerNegativeProtocolMatchTestV6RoCE.*"
         },
         {
-          "test_name_regex": "HwDiagShellStressTest.*"
-        },
-        {
-          "test_name_regex": "HwOverflowTest.*"
-        },
-        {
-          "test_name_regex": "HwPacketSendReceiveTest.*"
-        },
-        {
-          "test_name_regex": "HwCoppQueueStuckTest.*"
-        },
-        {
-          "test_name_regex": "HwCoppAclTest.*"
-        },
-        {
-          "test_name_regex": "HwCoppTest/1.*"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.VerifyCoppPpsLowPri"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.EapolToHighPriQ"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.DstIpNetworkControlDscpToHighPriQ"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.UnresolvedRoutesToLowPriQueue"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.JumboFramesToQueues"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.Ttl1PacketToLowPriQ"
-        },
-        {
-          "test_name_regex": "HwCoppTest/0.L3MTUErrorToLowPriQ"
-        },
-        {
-          "test_name_regex": "HwPacketSendTest.LldpToFrontPanelOutOfPort"
-        },
-        {
-          "test_name_regex": "HwPacketSendTest.LldpToFrontPanelWithBufClone"
-        },
-        {
-          "test_name_regex": "HwPacketSendTest.ArpRequestToFrontPanelPortSwitched"
-        },
-        {
-          "test_name_regex": "HwRouteStatTest.*"
-        },
-        {
-          "test_name_regex": "HwDscpMarkingTest.*"
-        },
-        {
-          "test_name_regex": "HwQueuePerHostL2Test.*"
-        },
-        {
-          "test_name_regex": "HwVlanTest.*"
-        },
-        {
-          "test_name_regex": "HwTrafficPfcTest/HwTrafficPfcGenTest.verifyPfc/WithZeroPgHeadRoomCfg"
-        },
-        {
-          "test_name_regex": "HwTrafficPfcTest/HwTrafficPfcGenTest.verifyPfc/WithZeroGlobalHeadRoomCfg"
-        },
-        {
-          "test_name_regex": "HwConfigVerifyQosTest.*"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchInterruptTest.*"
-        },
-        {
-          "test_name_regex": "Hw2QueueToOlympicQoSTest.*"
-        },
-        {
-          "test_name_regex": "HwAqmTest.*"
-        },
-        {
-          "test_name_regex": "HwCoppTest.*"
-        },
-        {
-          "test_name_regex": "HwCoppQosTest.*"
-        },
-        {
-          "test_name_regex": "HwDscpQueueMappingTest.*"
-        },
-        {
-          "test_name_regex": "HwHashConsistencyTest.*"
-        },
-        {
-          "test_name_regex": "HwIngressBufferTest.*"
-        },
-        {
-          "test_name_regex": "HwInPauseDiscardsCounterTest.*"
-        },
-        {
-          "test_name_regex": "HwInDiscardsCounterTest.*"
-        },
-        {
-          "test_name_regex": "HwJumboFramesTest.*"
-        },
-        {
-          "test_name_regex": "HwLoopBackTest.*"
-        },
-        {
-          "test_name_regex": "HwPortTest.PortLoopbackMode"
-        },
-        {
-          "test_name_regex": "HwLoadBalancerTestV[46].*"
-        },
-        {
-          "test_name_regex": "HwL4PortBlackHolingTest.v[46]UDP"
-        },
-        {
-          "test_name_regex": "HwOlympicQosSchedulerTest.*"
-        },
-        {
-          "test_name_regex": "HwOlympicQosTests.*"
-        },
-        {
-          "test_name_regex": "HwVerifyPfcConfigInHwTest.*"
-        },
-        {
-          "test_name_regex": "HwPacketSendTest.PortTxEnableTest"
+          "test_name_regex": "HwWideEcmpTest.*"
         },
         {
-          "test_name_regex": "HwProdInvariantsRswTest.verifyInvariants"
+          "test_name_regex": "HwAqmTest.verifyEcnThreshold"
         },
         {
-          "test_name_regex": "HwProdInvariantsRswStrictPriorityTest.verifyInvariants"
+          "test_name_regex": "HwResourceStatsTest/[01].l3Stats"
         },
         {
           "test_name_regex": "HwResourceStatsTest.l3Stats"
         },
-        {
-          "test_name_regex": "HwResourceStatsTest/[01].l3Stats"
-        },
         {
           "test_name_regex": "HwRouteTest/[01].AddHostRouteAndNeighbor"
         },
@@ -3783,70 +3492,28 @@
           "test_name_regex": "HwRouteTest/[01].verifyCpuRouteChange"
         },
         {
-          "test_name_regex": "HwRxReasonTests.InsertAndRemoveRxReason"
-        },
-        {
-          "test_name_regex": "HwSendPacketToQueueTest.*"
-        },
-        {
-          "test_name_regex": "HwTrafficPfcTest.*"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.packetIntegrityError"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.dramEnqueueDequeueBytes"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.localForwardingPostIsolate"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.rxPacketToCpu.*"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.trapPktsOnPort"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.stressLocalForwardingPostIsolate"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchTest.fdrCellDrops"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchFullScaleDsfNodesTest.*"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchWithMultipleDsfNodesTest.stressAddRemoveObjects"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchWithFabricPortsTest.*"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchWithMultipleDsfNodesTest.voqTailDropCounter"
-        },
-        {
-          "test_name_regex": "HwVoqSwitchWithMultipleDsfNodesTest.voqDelete"
+          "test_name_regex": "HwSplitAgentCallbackTest.txPacket"
         },
         {
-          "test_name_regex": "HwVoqSwitchWithMultipleDsfNodesTest.verifyDscpToVoqMapping"
+          "test_name_regex": "HwTrafficPfcTest/HwTrafficPfcGenTest.verifyPfc/WithZeroGlobalHeadRoomCfg"
         },
         {
-          "test_name_regex": "HwWatermarkTest.*"
+          "test_name_regex": "SaiRouteRollbackTest.*"
         },
         {
-          "test_name_regex": "HwSplitAgentCallbackTest.txPacket"
+          "test_name_regex": "HwIngressBufferTest.validatePGHeadroomLimitChange"
         },
         {
-          "test_name_regex": "HwParityErrorTest.*"
+          "test_name_regex": "warm_boot.HwTrafficPfcTest.PfcWatchdog"
         },
         {
-          "test_name_regex": "HwVoqSwitchInterruptTest.*"
+          "test_name_regex": "warm_boot.HwVerifyPfcConfigInHwTest.PfcWatchdogProgrammingSequence"
         },
         {
-          "test_name_regex": "HwRouteTest/[01].UnresolvedAndResolvedNextHop"
+          "test_name_regex": "warm_boot.HwParityErrorTest.verifyParityError"
         },
         {
-          "test_name_regex": "HwAsicDefaultProgrammingTest.*"
+          "test_name_regex": "HwAqmTest.verifyEcnTrafficNoDrop"
         }
     ],
     "brcm/8.2.0.0_odp/8.2.0.0_odp/tomahawk": [