diff --git a/library/mt_neighbor.py b/library/mt_neighbor.py
index 371bbc4..229b2bd 100644
--- a/library/mt_neighbor.py
+++ b/library/mt_neighbor.py
@@ -55,64 +55,65 @@ from ansible.module_utils.basic import AnsibleModule
 
 
 def main():
-    module = AnsibleModule(
-        argument_spec = dict(
-            hostname  = dict(required=True),
-            username  = dict(required=True),
-            password  = dict(required=True),
-            settings  = dict(required=False, type='dict'),
-            parameter = dict(
-                required  = True,
-                choices   = ['discovery'],
-                type      = 'str'
-            ),
-            state   = dict(
-                required  = False,
-                choices   = ['present', 'absent'],
-                type      = 'str'
-            ),
-        )
+  module = AnsibleModule(
+    argument_spec = dict(
+      hostname  = dict(required=True),
+      username  = dict(required=True),
+      password  = dict(required=True),
+      settings  = dict(required=False, type='dict'),
+      parameter = dict(
+        required  = True,
+        choices   = ['discovery'],
+        type      = 'str'
+      ),
+      state   = dict(
+        required  = False,
+        choices   = ['present', 'absent'],
+        type      = 'str'
+      ),
+    ),
+    supports_check_mode=True
+  )
+
+  idempotent_parameter = None
+  params = module.params
+  idempotent_parameter = 'name'
+
+
+  mt_obj = MikrotikIdempotent(
+    hostname         = params['hostname'],
+    username         = params['username'],
+    password         = params['password'],
+    state            = params['state'],
+    desired_params   = params['settings'],
+    idempotent_param = idempotent_parameter,
+    api_path         = '/ip/neighbor/' + str(params['parameter']),
+    check_mode       = module.check_mode
+  )
+
+  mt_obj.sync_state()
+
+  if mt_obj.failed:
+    module.fail_json(
+      msg = mt_obj.failed_msg
     )
-
-    idempotent_parameter = None
-    params = module.params
-    idempotent_parameter = 'name'
-
-
-    mt_obj = MikrotikIdempotent(
-        hostname         = params['hostname'],
-        username         = params['username'],
-        password         = params['password'],
-        state            = params['state'],
-        desired_params   = params['settings'],
-        idempotent_param = idempotent_parameter,
-        api_path         = '/ip/neighbor/' + str(params['parameter']),
-
+  elif mt_obj.changed:
+    module.exit_json(
+      failed=False,
+      changed=True,
+      msg=mt_obj.changed_msg,
+      diff={ "prepared": {
+        "old": mt_obj.old_params,
+        "new": mt_obj.new_params,
+      }},
+    )
+  else:
+    module.exit_json(
+      failed=False,
+      changed=False,
+      #msg='',
+      msg=params['settings'],
     )
-
-    mt_obj.sync_state()
-
-    if mt_obj.failed:
-        module.fail_json(
-          msg = mt_obj.failed_msg
-        )
-    elif mt_obj.changed:
-        module.exit_json(
-            failed=False,
-            changed=True,
-            msg=mt_obj.changed_msg,
-            diff={ "prepared": {
-                "old": mt_obj.old_params,
-                "new": mt_obj.new_params,
-            }},
-        )
-    else:
-        module.exit_json(
-            failed=False,
-            changed=False,
-            #msg='',
-            msg=params['settings'],
-        )
 
 if __name__ == '__main__':
   main()
diff --git a/tests/integration/tests.yml b/tests/integration/tests.yml
index 50e5607..31268c7 100644
--- a/tests/integration/tests.yml
+++ b/tests/integration/tests.yml
@@ -1984,7 +1984,11 @@
             name: ether2
             discover: "no"
         register: discovery_edit
-        failed_when: ( discovery_edit | changed )
+        failed_when: (
+            not ansible_check_mode
+          ) and (
+           ( discovery_edit | changed )
+          )
 
       - name: ALWAYS_CHANGES edit a interface discovery option
         mt_neighbor:
@@ -1996,7 +2000,11 @@
             name: ether2
             discover: "yes"
         register: discovery_edit
-        failed_when: not ( discovery_edit | changed )
+        failed_when: (
+            not ansible_check_mode
+          ) and (
+           not ( discovery_edit | changed )
+          )
 
       tags: neighbor