diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/isis-system-id-format-using-node-id.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/isis-system-id-format-using-node-id.cfg
index 9376b15ef9c..5ed57987034 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/isis-system-id-format-using-node-id.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/isis-system-id-format-using-node-id.cfg
@@ -67,5 +67,8 @@ router isis CORE
    !
    segment-routing mpls
       no shutdown
+!
+! TEST RAW_EOS_CLI
+
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml
index 199c7a516a1..9afef07015d 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/isis-system-id-format-using-node-id.yml
@@ -3,6 +3,9 @@ aaa_root:
 config_end: true
 enable_password:
   disabled: true
+eos_cli: '! TEST RAW_EOS_CLI
+
+  '
 hostname: isis-system-id-format-using-node-id
 ip_igmp_snooping:
   globally_enabled: true
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/isis-system-id-format-using-node-id.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/isis-system-id-format-using-node-id.yml
index e764f484484..7af66cb01d8 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/isis-system-id-format-using-node-id.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/isis-system-id-format-using-node-id.yml
@@ -8,6 +8,7 @@ isis_default_circuit_type: level-2
 isis_system_id_format: "node_id"
 
 type: "pe"
+avd_eos_designs_enforce_duplication_checks_across_all_models: true
 
 pe:
   defaults:
@@ -20,3 +21,5 @@ pe:
   nodes:
     - name: "isis-system-id-format-using-node-id"
       id: 99
+      raw_eos_cli: |
+        ! TEST RAW_EOS_CLI