diff --git a/lib/ansible/modules/database/mongodb/__init__.py b/lib/ansible/modules/database/mongodb/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/database/misc/mongodb_parameter.py b/lib/ansible/modules/database/mongodb/mongodb_parameter.py
similarity index 100%
rename from lib/ansible/modules/database/misc/mongodb_parameter.py
rename to lib/ansible/modules/database/mongodb/mongodb_parameter.py
diff --git a/lib/ansible/modules/database/misc/mongodb_user.py b/lib/ansible/modules/database/mongodb/mongodb_user.py
similarity index 99%
rename from lib/ansible/modules/database/misc/mongodb_user.py
rename to lib/ansible/modules/database/mongodb/mongodb_user.py
index a6be32d1b8..c80acdd6ff 100644
--- a/lib/ansible/modules/database/misc/mongodb_user.py
+++ b/lib/ansible/modules/database/mongodb/mongodb_user.py
@@ -189,6 +189,13 @@ EXAMPLES = '''
 
 '''
 
+RETURN = '''
+user:
+    description: The name of the user to add or remove.
+    returned: success
+    type: string
+'''
+
 import os
 import ssl as ssl_lib
 from distutils.version import LooseVersion
diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt
index 25d1967639..f6efd53c2b 100644
--- a/test/sanity/pep8/legacy-files.txt
+++ b/test/sanity/pep8/legacy-files.txt
@@ -104,7 +104,7 @@ lib/ansible/modules/cloud/webfaction/webfaction_site.py
 lib/ansible/modules/clustering/consul.py
 lib/ansible/modules/commands/script.py
 lib/ansible/modules/database/influxdb/influxdb_retention_policy.py
-lib/ansible/modules/database/misc/mongodb_user.py
+lib/ansible/modules/database/mongodb/mongodb_user.py
 lib/ansible/modules/database/mssql/mssql_db.py
 lib/ansible/modules/database/mysql/mysql_db.py
 lib/ansible/modules/database/mysql/mysql_replication.py