diff --git a/test/integration/targets/nxos_bgp/tests/common/sanity.yaml b/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
index 585820a6eb..55049b02f1 100644
--- a/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
@@ -4,10 +4,13 @@
   when: ansible_connection == "local"
 
 - set_fact: neighbor_down_fib_accelerate="true"
-  when: not titanium
+  when: (not titanium) and ((imagetag != 'N1') and (imagetag != 'D1'))
 
 - set_fact: reconnect_interval="55"
-  when: not titanium
+  when: (not titanium) and ((imagetag != 'N1') and (imagetag != 'D1'))
+
+- set_fact: isolate="false"
+  when: platform is not match("N35")
 
 - name: "Enable feature BGP"
   nxos_feature:
@@ -77,7 +80,7 @@
       graceful_restart_helper: true
       graceful_restart_timers_restart: 130
       graceful_restart_timers_stalepath_time: 310
-      isolate: false
+      isolate: "{{isolate|default(omit)}}"
       log_neighbor_changes: true
       maxas_limit: 50
       neighbor_down_fib_accelerate: "{{neighbor_down_fib_accelerate|default(omit)}}"