diff --git a/feature/bgp/policybase/otg_tests/community_test/community_test.go b/feature/bgp/policybase/otg_tests/community_test/community_test.go
index c5164592725..cffaed08f8b 100644
--- a/feature/bgp/policybase/otg_tests/community_test/community_test.go
+++ b/feature/bgp/policybase/otg_tests/community_test/community_test.go
@@ -78,7 +78,9 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string,
 			}
 		}
 		communitySet.SetCommunityMember(cs)
-		communitySet.SetMatchSetOptions(matchSetOptions)
+		if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
+			communitySet.SetMatchSetOptions(matchSetOptions)
+		}
 	}
 	var communitySetCLIConfig string
 	if deviations.CommunityMemberRegexUnsupported(dut) && communitySetName == comunitySetNameRegex {
diff --git a/feature/bgp/policybase/otg_tests/community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
index 4c6b8f1496e..fdcfc1a0fc9 100644
--- a/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
+++ b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
@@ -37,7 +37,6 @@ platform_exceptions: {
   deviations: {
     explicit_interface_in_default_vrf:  true
     interface_enabled: true
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 platform_exceptions: {