diff --git a/library/mt_system.py b/library/mt_system.py
index d2cc72e..9216f19 100644
--- a/library/mt_system.py
+++ b/library/mt_system.py
@@ -57,67 +57,69 @@ 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   = ['ntp_client', 'clock', 'identity', 'logging', 'routerboard_settings'],
-                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   = ['ntp_client', 'clock', 'identity', 'logging', 'routerboard_settings'],
+        type      = 'str'
+      ),
+      state   = dict(
+        required  = False,
+        choices   = ['present', 'absent'],
+        type      = 'str'
+      ),
+    ),
+    supports_check_mode=True
+  )
+
+  params = module.params
+
+  if params['parameter'] == 'routerboard_settings':
+    params['parameter'] = 'routerboard/settings'
+
+  if params['parameter'] == 'ntp_client':
+    params['parameter'] = 'ntp/client'
+
+  clean_params(params['settings'])
+  mt_obj = MikrotikIdempotent(
+    hostname        = params['hostname'],
+    username        = params['username'],
+    password        = params['password'],
+    state           = params['state'],
+    desired_params  = params['settings'],
+    idempotent_param= None,
+    api_path        = '/system/' + params['parameter'],
+    check_mode      = module.check_mode
+  )
+
+  mt_obj.sync_state()
+
+  if mt_obj.failed:
+    module.fail_json(
+      msg = mt_obj.failed_msg
     )
-
-    params = module.params
-
-    if params['parameter'] == 'routerboard_settings':
-      params['parameter'] = 'routerboard/settings'
-
-    if params['parameter'] == 'ntp_client':
-      params['parameter'] = 'ntp/client'
-
-    clean_params(params['settings'])
-    mt_obj = MikrotikIdempotent(
-        hostname        = params['hostname'],
-        username        = params['username'],
-        password        = params['password'],
-        state           = params['state'],
-        desired_params  = params['settings'],
-        idempotent_param= None,
-        api_path        = '/system/' + 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 0458866..8411d00 100644
--- a/tests/integration/tests.yml
+++ b/tests/integration/tests.yml
@@ -1432,7 +1432,11 @@
           settings:
             time-zone-name: GMT
         register: mt_clock
-        failed_when: not ( mt_clock | changed )
+        failed_when: (
+            not ansible_check_mode
+          ) and (
+            not ( mt_clock | changed )
+          )
 
       - name: set ntp client
         mt_system:
@@ -1456,7 +1460,11 @@
             primary-ntp: 199.182.221.11
             secondary-ntp: 67.215.197.149
         register: mt_ntp_client
-        failed_when: ( mt_ntp_client | changed )
+        failed_when: (
+            not ansible_check_mode
+          ) and (
+            ( mt_ntp_client | changed )
+          )
 
       - name: ALWAYS_CHANGES modify ntp client
         mt_system:
@@ -1469,7 +1477,11 @@
             primary-ntp: 199.182.221.11
             secondary-ntp: 67.215.197.149
         register: mt_ntp_client_change
-        failed_when: not ( mt_ntp_client_change | changed )
+        failed_when: (
+            not ansible_check_mode
+          ) and (
+            not ( mt_ntp_client_change | changed )
+          )
 
       ##############################################
       # WIP