diff --git a/docs/devel/flaky-tests.md b/docs/devel/flaky-tests.md
index e757021ff27..b599f80f4ec 100644
--- a/docs/devel/flaky-tests.md
+++ b/docs/devel/flaky-tests.md
@@ -88,11 +88,20 @@ we have the following guidelines:
 3. If you can reproduce it (or it's obvious from the logs what happened), you
    should then be able to fix it, or in the case where someone is clearly more
    qualified to fix it, reassign it with very clear instructions.
-4. If you can't reproduce it: __don't just close it!__ Every time a flake comes
+4. PRs that fix or help debug flakes may have the P0 priority set to get them
+   through the merge queue as fast as possible.
+5. Once you have made a change that you believe fixes a flake, it is conservative
+   to keep the issue for the flake open and see if it manifests again after the
+   change is merged.
+6. If you can't reproduce a flake: __don't just close it!__ Every time a flake comes
    back, at least 2 hours of merge time is wasted. So we need to make monotonic
    progress towards narrowing it down every time a flake occurs. If you can't
    figure it out from the logs, add log messages that would have help you figure
-   it out.
+   it out.  If you make changes to make a flake more reproducible, please link
+   your pull request to the flake you're working on.
+7. If a flake has been open, could not be reproduced, and has not manifested in
+   3 months, it is reasonable to close the flake issue with a note saying
+   why.
 
 # Reproducing unit test flakes