diff --git a/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
index 47e3cce0f8..b457624c96 100644
--- a/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
+++ b/test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
@@ -41,8 +41,9 @@
 
   - name: "Run show running-config bgp - should pass"
     nxos_command:
-      commands:
-        - sh running-config bgp
+      commands: 
+        - command: sh running-config bgp
+          output: text
       provider: "{{ nxapi }}"
     register: result
 
diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
index 393b686fc0..cc62c01930 100644
--- a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
+++ b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
index acec416683..75d88690a0 100644
--- a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
+++ b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ cli }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
index 6eeeeafd2c..0c534c5c0d 100644
--- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
+++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
index 17e3390d70..a5f0830499 100644
--- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
+++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml
@@ -5,7 +5,7 @@
   nxos_config:
     lines:
       - "snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none
 
@@ -37,7 +37,7 @@
   nxos_config:
     lines:
       - "no snmp-server contact ansible"
-      - "hostname {{ inventory_hostname_short }}"
+      - "hostname switch"
     provider: "{{ nxapi }}"
     match: none