diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5eae6f5469..9b88b2a41e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,9 +26,7 @@ If you use the command "ttn-lw-stack config", you can redact sensitive config.
 -->
 
 #### What do you see now?
-<!--
-Please paste terminal output, upload logs (as .txt) or upload screenshots.
--->
+<!-- Please paste terminal output, upload logs (as .txt) or upload screenshots. -->
 
 ...
 
@@ -50,6 +48,11 @@ Paste the output of "ttn-lw-cli version" or "ttn-lw-stack version" if applicable
 
 ...
 
+#### How do you propose to test this?
+<!-- Please think about how this is verified as fixed. -->
+
+...
+
 #### Can you do this yourself and submit a Pull Request?
 <!-- You can also @mention experts if you need help with this. -->
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 02eadf0703..2e9cde1368 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -44,6 +44,14 @@ Paste the output of "ttn-lw-cli version" or "ttn-lw-stack version" if applicable
 
 ...
 
+#### How do you propose to test this?
+<!--
+Please think about how this is verified as implemented.
+For example, you can add what commands need to be run via the CLI/Console to verify that this works.
+-->
+
+...
+
 #### Can you do this yourself and submit a Pull Request?
 <!-- You can also @mention experts if you need help with this. -->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6b3e41200a..90c9a379b2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,6 +17,19 @@ Closes #0000, References #0000, etc.
 - ...
 - ...
 
+
+#### Testing
+
+<!-- How did you verify that this change works? -->
+
+...
+
+##### Regressions
+
+<!-- Please indicate features that this change could affect and how that was tested. -->
+
+...
+
 #### Notes for Reviewers
 <!--
 NOTE: This section is optional.
@@ -34,7 +47,6 @@ implementation proposal in the referenced issues.
 
 - [ ] Scope: The referenced issue is addressed, there are no unrelated changes.
 - [ ] Compatibility: The changes are backwards compatible with existing API, storage, configuration and CLI, according to the compatibility commitments in `README.md`. The target branch is set to `master` if the changes are fully compatible with existing API, database, configuration and CLI.
-- [ ] Testing: The changes are covered with unit tests. The changes are tested manually as well.
 - [ ] Documentation: Relevant documentation is added or updated.
 - [ ] Changelog: Significant features, behavior changes, deprecations and fixes are added to `CHANGELOG.md`.
 - [ ] Commits: Commit messages follow guidelines in `CONTRIBUTING.md`, there are no fixup commits left.