diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..0b4f598a5b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,15 @@
+_Thanks for wanting to report an issue you've found in node_redis. Please delete
+this text and fill in the template below. Please note that the issue tracker is only
+for bug reports or feature requests. If you have a question, please ask that on [gitter].
+If unsure about something, just do as best as you're able._
+
+_Note that it will be much easier to fix the issue if a test case that reproduces
+the problem is provided. It is of course not always possible to reduce your code
+to a small test case, but it's highly appreciated to have as much data as possible.
+Thank you!_
+
+* **Version**: What node_redis version is the issue happening on?
+* **Platform**: What platform / version? (For example Node.js 0.10 or Node.js 5.7.0)
+* **Description**: Description of your issue, stack traces from errors and code that reproduces the issue
+
+[gitter]: https://gitter.im/NodeRedis/node_redis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..9706621c1b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+### Pull Request check-list
+
+_Please make sure to review and check all of these items:_
+
+- [ ] Does `npm test` pass with this change (including linting)?
+- [ ] Is the new or changed code fully tested?
+- [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
+
+_NOTE: these things are not required to open a PR and can be done
+afterwards / while the PR is open._
+
+### Description of change
+
+_Please provide a description of the change here._
\ No newline at end of file