The annotation code in origin and k8s-tests should be removed and replaced, or refactored to at least not inject the annotations into the test names themselves.  After TRT-1840 and TRT-1852 you can skip based on labels and other criteria. Skip information should be decided at run-time, and should not require revendoring.