diff --git a/database/misc/mongodb_user.py b/database/misc/mongodb_user.py
index 12d348e9a92..71ce961febb 100644
--- a/database/misc/mongodb_user.py
+++ b/database/misc/mongodb_user.py
@@ -172,6 +172,8 @@ def user_add(module, client, db_name, user, password, roles):
 def user_remove(module, client, db_name, user):
     exists = user_find(client, user)
     if exists:
+        if module.check_mode:
+            module.exit_json(changed=True, user=user)
         db = client[db_name]
         db.remove_user(user)
     else:
@@ -212,7 +214,8 @@ def main():
             roles=dict(default=None, type='list'),
             state=dict(default='present', choices=['absent', 'present']),
             update_password=dict(default="always", choices=["always", "on_create"]),
-        )
+        ),
+        supports_check_mode=True
     )
 
     if not pymongo_found:
@@ -264,6 +267,9 @@ def main():
         if update_password != 'always' and user_find(client, user):
             password = None
 
+        if module.check_mode:
+            module.exit_json(changed=True, user=user)
+
         try:
             user_add(module, client, db_name, user, password, roles)
         except OperationFailure, e: