diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
index 309b5269f4b..50d211751ce 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
@@ -71,6 +71,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
+import org.junit.rules.TestWatcher;
 import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
@@ -2972,6 +2973,9 @@ public void testBug371100() {
 		assertFalse(logged);
 	}
 
+	@Rule
+	public TestWatcher screenshotRule = Screenshots.onFailure();
+
 	@Test
 	public void testBug372226() {
 		assumeFalse("Test fails on Mac: Bug 537639", Platform.OS_MACOSX.equals(Platform.getOS()));
@@ -2991,8 +2995,6 @@ public void testBug372226() {
 		Control control = (Control) part.getWidget();
 		assertEquals(subShell, control.getParent());
 
-		Screenshots.takeScreenshot(getClass(), testName.getMethodName());
-
 		appContext.get(EPartService.class).activate(part);
 		assertEquals(subShell, control.getParent());
 	}
diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ScreenshotOnFailureRule.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ScreenshotOnFailureRule.java
deleted file mode 100644
index da2da95943f..00000000000
--- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ScreenshotOnFailureRule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019 Red Hat Inc. and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * - Mickael Istria (Red Hat Inc.) - initial implementation
- *******************************************************************************/
-package org.eclipse.jface.text.tests;
-
-import org.junit.rules.TestWatcher;
-
-import org.eclipse.test.Screenshots;
-
-public final class ScreenshotOnFailureRule extends TestWatcher {
-	@Override
-	protected void failed(Throwable e, org.junit.runner.Description description) {
-		Screenshots.takeScreenshot(description.getTestClass(), description.getMethodName());
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java
index 0adf9d3d1c8..f0ecf7e0182 100644
--- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java
+++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextViewerTest.java
@@ -28,6 +28,9 @@
 import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestWatcher;
+
+import org.eclipse.test.Screenshots;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
@@ -73,7 +76,9 @@
  */
 public class TextViewerTest {
 
-	@Rule public ScreenshotOnFailureRule screenshotRule = new ScreenshotOnFailureRule();
+	@Rule
+	public TestWatcher screenshotRule= Screenshots.onFailure();
+
 	private Shell fShell;
 
 	@After
diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
index f9c3eba068e..4775458d4b5 100644
--- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
+++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
@@ -25,6 +25,9 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestWatcher;
+
+import org.eclipse.test.Screenshots;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
@@ -57,7 +60,6 @@
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.AnnotationPainter;
 import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.tests.ScreenshotOnFailureRule;
 import org.eclipse.jface.text.tests.TextViewerTest;
 import org.eclipse.jface.text.tests.util.DisplayHelper;
 
@@ -66,7 +68,8 @@ public class CodeMiningTest {
 	private SourceViewer fViewer;
 	private Shell fShell;
 
-	@Rule public ScreenshotOnFailureRule rule = new ScreenshotOnFailureRule();
+	@Rule
+	public TestWatcher screenshotRule= Screenshots.onFailure();
 
 	@Before
 	public void setUp() {