diff --git a/.github/ISSUE_TEMPLATE/tck_challenge.md b/.github/ISSUE_TEMPLATE/tck_challenge.md
new file mode 100644
index 00000000..aff95cc9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/tck_challenge.md
@@ -0,0 +1,21 @@
+---
+name: TCK Challenge
+about: Create a TCK Challenge
+title: ''
+labels: 'challenge'
+assignees: ''
+
+---
+
+**Challenged tests**
+List the challenged tests with the fully qualified classnames and then the test methods, e.g.
+ee.jakarta.tck.faces.test.javaee7.multiFieldValidation.Spec1IT#testFailingPreconditionsNotAfterAllInputComponents
+
+**TCK Version**
+Specify the version of the TCK, e.g. Jakarta Faces 4.0.x
+
+**Description**
+A clear and concise description of why you think the tests are wrong.
+
+**Additional context**
+Add any other context about the challenge here.