diff --git a/.github/ISSUE_TEMPLATE/failing-test.md b/.github/ISSUE_TEMPLATE/failing-test.md
index ca843e19537..fb9cda489d1 100644
--- a/.github/ISSUE_TEMPLATE/failing-test.md
+++ b/.github/ISSUE_TEMPLATE/failing-test.md
@@ -1,11 +1,11 @@
 ---
 name: Failing Test
-about: Report test failures in Kubernetes CI jobs
+about: Report continuously failing tests or jobs in Kubernetes CI
 labels: kind/failing-test
 
 ---
 
-<!-- Please only use this template for submitting reports about failing tests in Kubernetes CI jobs -->
+<!-- Please only use this template for submitting reports about continuously failing tests or jobs in Kubernetes CI -->
 
 **Which jobs are failing**:
 
diff --git a/.github/ISSUE_TEMPLATE/flaking-test.md b/.github/ISSUE_TEMPLATE/flaking-test.md
new file mode 100644
index 00000000000..7628634b992
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/flaking-test.md
@@ -0,0 +1,20 @@
+---
+name: Flaking Test
+about: Report flaky tests or jobs in Kubernetes CI
+labels: kind/flake
+
+---
+
+<!-- Please only use this template for submitting reports about flaky tests or jobs (pass or fail with no underlying change in code) in Kubernetes CI -->
+
+**Which jobs are flaking**:
+
+**Which test(s) are flaking**:
+
+**Testgrid link**:
+
+**Reason for failure**:
+
+**Anything else we need to know**:
+- links to go.k8s.io/triage appreciated
+- links to specific failures in spyglass appreciated