diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7c3765db21f..ed8f1c99f5b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,46 +3,21 @@ Thanks for opening a Pull Request (PR), here's a few guidelines as to what we ne
 <!-- REQUIRED  https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue -->
 Fixes: `<issue-number>`
 
-## How did you solve the problem?
+## Are there more details and context that will help us understand and review this pull request?
 
-<!-- REQUIRED
+<!-- OPTIONAL
 
-Short description of the changes you made and how they address the linked issue.
+Further description of the changes you made if the pull request title is insufficient, and how they address the linked issue.
 This should be written directly in the PR so reviewers and testers understand a basic overview of the change.
 It also ensures this PR is self documenting to viewers from the future.
+If appropriate, help the reviewer by pointing to parts of the PR that might need special attention or where you would like explicit feedback.
 
 -->
 
-## What should the reviewer focus on?
-
-<!-- OPTIONAL
-
-Help the reviewer by pointing to parts of the PR that might need special attention or where you would like explicit feedback.
-
--->
-
-## How to test this PR?
-
-<!-- REQUIRED
-
-Include explicit steps to test this PR. Valid answers include:
-- filling the task list below with steps to execute the code and expected outcomes.
-- tested in CI, no explicit testing needed (for PRs where this is true)
-- link to test scenarios in the issue or some other document. No need to repeat yourself
-
--->
-
-### Test template (replace with a block for each scenario)
-
-1. Open http://olympia.test
-2. Navigate to X
-3. Click Button
-
-**expected**: You see a notification telling you the current time.
-
 ## Check list
 
 - [ ] This PR relates to an existing open issue and there are no existing PRs open for the same issue.
 - [ ] The change has been successfully run locally.
 - [ ] Add tests to cover the changes added in this PR.
+- [ ] Add a comment to the issue that describes how to manually test the changes you have made in this PR.
 - [ ] Add before and after screenshots (Only for changes that impact the UI).