diff --git a/.github/ISSUE_TEMPLATE/tck_challenge.md b/.github/ISSUE_TEMPLATE/tck_challenge.md
new file mode 100644
index 0000000000..aff95cc932
--- /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.
diff --git a/tck/faces22/cdiInitDestroyEvent/src/test/java/ee/jakarta/tck/faces/test/javaee7/cdiinitdestroyevent/cdiinitdestroyevent/Issue2997IT.java b/tck/faces22/cdiInitDestroyEvent/src/test/java/ee/jakarta/tck/faces/test/javaee7/cdiinitdestroyevent/cdiinitdestroyevent/Issue2997IT.java
index c7f6a3d478..c7f0d5e80c 100644
--- a/tck/faces22/cdiInitDestroyEvent/src/test/java/ee/jakarta/tck/faces/test/javaee7/cdiinitdestroyevent/cdiinitdestroyevent/Issue2997IT.java
+++ b/tck/faces22/cdiInitDestroyEvent/src/test/java/ee/jakarta/tck/faces/test/javaee7/cdiinitdestroyevent/cdiinitdestroyevent/Issue2997IT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -21,6 +21,7 @@
 
 import jakarta.faces.flow.FlowScoped;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
@@ -30,6 +31,7 @@
 
 // https://github.com/eclipse-ee4j/mojarra/issues/3001
 // https://github.com/jakartaee/faces/issues/1734
+@Disabled("Depends on non-specified abandoned flow -- See https://github.com/jakartaee/faces/issues/1955")
 public class Issue2997IT extends BaseITNG {
 
     /**
diff --git a/tck/faces40/beanValidation/src/test/java/ee/jakarta/tck/faces/test/servlet50/beanValidation/Issue5171IT.java b/tck/faces40/beanValidation/src/test/java/ee/jakarta/tck/faces/test/servlet50/beanValidation/Issue5171IT.java
index b4014563b3..a1505353e2 100644
--- a/tck/faces40/beanValidation/src/test/java/ee/jakarta/tck/faces/test/servlet50/beanValidation/Issue5171IT.java
+++ b/tck/faces40/beanValidation/src/test/java/ee/jakarta/tck/faces/test/servlet50/beanValidation/Issue5171IT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to Eclipse Foundation.
+ * Copyright (c) 2022, 2024 Contributors to Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at