diff --git a/test/integration/targets/iosxr_interface/tests/cli/intent.yaml b/test/integration/targets/iosxr_interface/tests/cli/intent.yaml
index 00eb42fc68..bbf96d1f06 100644
--- a/test/integration/targets/iosxr_interface/tests/cli/intent.yaml
+++ b/test/integration/targets/iosxr_interface/tests/cli/intent.yaml
@@ -3,15 +3,15 @@
 
 - name: Setup (interface is up)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
-    description: test_interface_5
+    name: GigabitEthernet0/0/0/1
+    description: test_interface_1
     enabled: True
     state: present
   register: result
 
 - name: Check intent arguments
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     state: up
     delay: 20
   register: result
@@ -22,7 +22,7 @@
 
 - name: Check intent arguments (failed condition)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     state: down
   ignore_errors: yes
   register: result
@@ -34,7 +34,7 @@
 
 - name: Config + intent
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     enabled: False
     state: down
     delay: 20
@@ -46,7 +46,7 @@
 
 - name: Config + intent (fail)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     enabled: False
     state: up
   ignore_errors: yes
@@ -60,7 +60,7 @@
 - name: Aggregate config + intent (pass)
   iosxr_interface:
     aggregate:
-    - name: GigabitEthernet0/0/0/5
+    - name: GigabitEthernet0/0/0/1
       enabled: True
       state: up
       delay: 20
diff --git a/test/integration/targets/iosxr_user/tests/cli/auth.yaml b/test/integration/targets/iosxr_user/tests/cli/auth.yaml
index 9f633e4c9a..f9a186a592 100644
--- a/test/integration/targets/iosxr_user/tests/cli/auth.yaml
+++ b/test/integration/targets/iosxr_user/tests/cli/auth.yaml
@@ -8,13 +8,13 @@
 
   - name: test login
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
       responses:
         (?i)password: "pass123"
 
   - name: test login with invalid password (should fail)
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
       responses:
         (?i)password: "badpass"
     ignore_errors: yes