diff --git a/lib/ansible/modules/network/eos/eos_interface.py b/lib/ansible/modules/network/eos/eos_interface.py
index 5d338826270..500540bd642 100644
--- a/lib/ansible/modules/network/eos/eos_interface.py
+++ b/lib/ansible/modules/network/eos/eos_interface.py
@@ -330,7 +330,7 @@ def check_declarative_intent_params(module, want, result):
         if result['changed']:
             sleep(w['delay'])
 
-        command = 'show interfaces %s' % w['name']
+        command = {'command': 'show interfaces %s' % w['name'], 'output': 'text'}
         output = run_commands(module, [command])
 
         if want_state in ('up', 'down'):
@@ -363,7 +363,8 @@ def check_declarative_intent_params(module, want, result):
             have_host = []
             have_port = []
             if have_neighbors is None:
-                have_neighbors = run_commands(module, ['show lldp neighbors {}'.format(w['name'])])
+                command = {'command': 'show lldp neighbors {}'.format(w['name']), 'output': 'text'}
+                have_neighbors = run_commands(module, [command])
 
             if have_neighbors[0]:
                 lines = have_neighbors[0].strip().split('\n')
diff --git a/lib/ansible/modules/network/eos/eos_lldp.py b/lib/ansible/modules/network/eos/eos_lldp.py
index 3cd438658aa..19b76c2e92b 100644
--- a/lib/ansible/modules/network/eos/eos_lldp.py
+++ b/lib/ansible/modules/network/eos/eos_lldp.py
@@ -58,10 +58,10 @@ from ansible.module_utils.network.eos.eos import eos_argument_spec
 
 
 def has_lldp(module):
-    output = run_commands(module, ['show lldp'])
+    config = get_config(module, flags=['| section lldp'])
 
     is_lldp_enable = False
-    if len(output) > 0 and "LLDP is not enabled" not in output[0]:
+    if "no lldp run" not in config:
         is_lldp_enable = True
 
     return is_lldp_enable
diff --git a/test/integration/targets/eos_facts/tests/eapi/all_facts.yaml b/test/integration/targets/eos_facts/tests/eapi/all_facts.yaml
index 4a993bc9b1b..1112148a5ea 100644
--- a/test/integration/targets/eos_facts/tests/eapi/all_facts.yaml
+++ b/test/integration/targets/eos_facts/tests/eapi/all_facts.yaml
@@ -1,6 +1,11 @@
 ---
 - debug: msg="START eapi/all_facts.yaml"
 
+- name: Make sure LLDP is running (setup)
+  eos_config:
+    lines: lldp run
+    authorize: yes
+    provider: "{{ eapi }}"
 
 - name: test getting all facts
   eos_facts:
@@ -9,8 +14,6 @@
       - all
   register: result
 
-
-
 - assert:
     that:
       # _facts modules should never report a change
@@ -28,4 +31,10 @@
       - "result.ansible_facts.ansible_net_memfree_mb > 1"
       - "result.ansible_facts.ansible_net_memtotal_mb > 1"
 
+- name: Make sure LLDP is running (teardown)
+  eos_config:
+    lines: no lldp run
+    authorize: yes
+    provider: "{{ eapi }}"
+
 - debug: msg="END eapi/all_facts.yaml"
diff --git a/test/integration/targets/eos_interface/tests/eapi/intent.yaml b/test/integration/targets/eos_interface/tests/eapi/intent.yaml
index fd01c9f498a..90fa359b0b8 100644
--- a/test/integration/targets/eos_interface/tests/eapi/intent.yaml
+++ b/test/integration/targets/eos_interface/tests/eapi/intent.yaml
@@ -6,6 +6,13 @@
     test_interface_1: ethernet1
     test_interface_2: ethernet2
 
+- name: Make sure LLDP is running
+  eos_config:
+    lines: lldp run
+    authorize: yes
+    provider: "{{ eapi }}"
+  become: yes
+
 - name: Check intent arguments
   eos_interface:
     name: "{{ test_interface_1 }}"
@@ -159,3 +166,9 @@
           - "'host dummy_host' in result.failed_conditions"
           - "'port dummy_port' in result.failed_conditions"
   when: "'an-vyos-02' in show_lldp_neighbors_result.stdout[0]"
+
+- name: Make sure LLDP is running (teardown)
+  eos_config:
+    lines: no lldp run
+    authorize: yes
+    provider: "{{ eapi }}"
diff --git a/test/integration/targets/eos_l3_interface/tests/cli/basic.yaml b/test/integration/targets/eos_l3_interface/tests/cli/basic.yaml
index 3b700ea5a2f..0a25e96df93 100644
--- a/test/integration/targets/eos_l3_interface/tests/cli/basic.yaml
+++ b/test/integration/targets/eos_l3_interface/tests/cli/basic.yaml
@@ -18,7 +18,7 @@
 - name: Configure interface ipv4 address
   eos_l3_interface:
     name: "{{ test_interface_1 }}"
-    ipv4: 192.108.0.1/24
+    ipv4: 192.108.1.1/24
     state: present
     authorize: yes
     provider: "{{ cli }}"
@@ -29,12 +29,12 @@
     that:
       - 'result.changed == true'
       - '"interface {{ test_interface_1 }}" in result.commands'
-      - '"ip address 192.108.0.1/24" in result.commands'
+      - '"ip address 192.108.1.1/24" in result.commands'
 
 - name: Configure interface ipv4 address (idempotent)
   eos_l3_interface:
     name: "{{ test_interface_1 }}"
-    ipv4: 192.108.0.1/24
+    ipv4: 192.108.1.1/24
     state: present
     authorize: yes
     provider: "{{ cli }}"
@@ -144,8 +144,8 @@
 - name: Configure ipv4 and ipv6 address using aggregate
   eos_l3_interface:
     aggregate:
-    - { name: "{{ test_interface_1 }}", ipv4: 192.108.0.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
-    - { name: "{{ test_interface_2 }}", ipv4: 192.109.0.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
+    - { name: "{{ test_interface_1 }}", ipv4: 192.108.1.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
+    - { name: "{{ test_interface_2 }}", ipv4: 192.109.1.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
     authorize: yes
     provider: "{{ cli }}"
   become: yes
@@ -155,17 +155,17 @@
     that:
       - 'result.changed == true'
       - '"interface {{ test_interface_1 }}" in result.commands'
-      - '"ip address 192.108.0.1/24" in result.commands'
+      - '"ip address 192.108.1.1/24" in result.commands'
       - '"ipv6 address fd5d:12c9:2201:2::2/64" in result.commands'
       - '"interface {{ test_interface_2 }}" in result.commands'
-      - '"ip address 192.109.0.2/16" in result.commands'
+      - '"ip address 192.109.1.2/16" in result.commands'
       - '"ipv6 address fd5e:12c9:2201:3::3/32" in result.commands'
 
 - name:  Configure ipv4 and ipv6 address using aggregate (idempotent)
   eos_l3_interface:
     aggregate:
-    - { name: "{{ test_interface_1 }}", ipv4: 192.108.0.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
-    - { name: "{{ test_interface_2 }}", ipv4: 192.109.0.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
+    - { name: "{{ test_interface_1 }}", ipv4: 192.108.1.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
+    - { name: "{{ test_interface_2 }}", ipv4: 192.109.1.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
     authorize: yes
     provider: "{{ cli }}"
   become: yes
diff --git a/test/integration/targets/eos_l3_interface/tests/eapi/basic.yaml b/test/integration/targets/eos_l3_interface/tests/eapi/basic.yaml
index c05cd6ea296..569e67ed81e 100644
--- a/test/integration/targets/eos_l3_interface/tests/eapi/basic.yaml
+++ b/test/integration/targets/eos_l3_interface/tests/eapi/basic.yaml
@@ -17,7 +17,7 @@
 - name: Configure interface ipv4 address
   eos_l3_interface:
     name: "{{ test_interface_1 }}"
-    ipv4: 192.168.0.1/24
+    ipv4: 192.168.1.1/24
     state: present
     authorize: yes
     provider: "{{ eapi }}"
@@ -27,12 +27,12 @@
     that:
       - 'result.changed == true'
       - '"interface {{ test_interface_1 }}" in result.commands'
-      - '"ip address 192.168.0.1/24" in result.commands'
+      - '"ip address 192.168.1.1/24" in result.commands'
 
 - name: Configure interface ipv4 address (idempotent)
   eos_l3_interface:
     name: "{{ test_interface_1 }}"
-    ipv4: 192.168.0.1/24
+    ipv4: 192.168.1.1/24
     state: present
     authorize: yes
     provider: "{{ eapi }}"