diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index aab60bc2a..9f5f33275 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+If you are planning to open a pull-request just open the pull-request instead of making an issue first.
+
 FOR FEATURES:
 
 Describe the feature you want and your use case.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8617fa90c..7d7e70eae 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,11 @@
-Describe your change.
+Describe the change you are making here!
 
-Use the following checklist to see when you're ready to merge (for docs-only changes you can skip this).
+Please include tests. Check out these examples:
 
-- [ ] For bugs, your first commit should be a test that reproduces the bug.
-  This test should fail.
-- [ ] Implement the change
-- [ ] Add unit tests as appropriate
-      Example: builder/virtualbox/common/ssh_config_test.go:19
-- [ ] Add an acceptance test with a template example using your feature
-      Example: post-processor/compress/post-processor_test.go:153
-- [ ] Verify that tests pass
-- [ ] For features, update / add documentation under `website/`
-- [ ] Format your code with `go fmt`
-- [ ] Rebase onto master
-- [ ] If your PR resolves other open issues, indicate them below
+- https://github.com/mitchellh/packer/blob/master/builder/virtualbox/common/ssh_config_test.go#L19-L37
+- https://github.com/mitchellh/packer/blob/master/post-processor/compress/post-processor_test.go#L153-L182
+
+If your PR resolves any open issue(s), please indicate them like this so they will be closed when your PR is merged:
 
 Closes #xxx
 Closes #xxx