diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
index f20ccbb2d38..6d62e4f19f2 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java
@@ -20,6 +20,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -58,6 +59,10 @@
 import org.eclipse.ui.editors.tests.TestUtil;
 
 public class CodeMiningTest {
+
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static String PROJECT_NAME = "test_" + new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
 
 	private static IProject project;
@@ -80,7 +85,6 @@ public void after() {
 		drainEventQueue();
 		CodeMiningTestProvider.provideContentMiningAtOffset = -1;
 		CodeMiningTestProvider.provideHeaderMiningAtLine = -1;
-		TestUtil.cleanUp();
 	}
 
 	private static void closeAllEditors() {
@@ -357,4 +361,4 @@ private final boolean waitForCondition(Display display, long timeout, Callable<B
 		} while (!cond && diff < timeout);
 		return cond;
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/CaseActionTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/CaseActionTest.java
index 40c42e95a90..f49fc538b47 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/CaseActionTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/CaseActionTest.java
@@ -22,6 +22,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -50,6 +51,9 @@ public class CaseActionTest {
 	private static IFile file;
 	private AbstractTextEditor editor;
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 		project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
@@ -63,7 +67,6 @@ public static void setUpBeforeClass() throws Exception {
 	public static void tearDownAfterClass() throws Exception {
 		file.delete(true, new NullProgressMonitor());
 		project.delete(true, new NullProgressMonitor());
-		TestUtil.cleanUp();
 	}
 
 	@Before
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
index 3d416c3ca5b..00adae21eab 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -31,6 +31,9 @@
 
 public class ChainedPreferenceStoreTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private class PropertyChangeListener implements IPropertyChangeListener {
 
 		@Override
@@ -47,10 +50,6 @@ public void propertyChange(PropertyChangeEvent event) {
 	private static final String DEFAULT_VALUE= "4";
 	private static final String DEFAULT_DEFAULT_VALUE= "";
 
-	@After
-	public void tearDown() {
-		TestUtil.cleanUp();
-	}
 
 	/**
 	 * [implementation] ChainedPreferenceStore
@@ -140,4 +139,4 @@ public void testChainedStore3() {
 		assertEquals(null, event.getOldValue());
 		assertEquals(DEFAULT_VALUE, event.getNewValue());
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/DocumentProviderRegistryTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/DocumentProviderRegistryTest.java
index 9d50b77209e..619b30bf2fe 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/DocumentProviderRegistryTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/DocumentProviderRegistryTest.java
@@ -44,6 +44,9 @@ public class DocumentProviderRegistryTest {
 	@Rule
 	public TemporaryFolder tmp = new TemporaryFolder();
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private IFile file;
 
 	@After
@@ -51,7 +54,6 @@ public void tearDown() throws Exception {
 		if (file != null) {
 			ResourceHelper.delete(file.getProject());
 		}
-		TestUtil.cleanUp();
 	}
 
 	@Test
@@ -81,4 +83,4 @@ public static class TestDocumentProvider extends TextFileDocumentProvider {
 		// found the right one.
 
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
index 1bc13e6ef78..6bbe403e181 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
@@ -20,6 +20,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.ScrolledComposite;
@@ -61,6 +62,9 @@
  */
 public class EncodingChangeTests {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static final String NON_DEFAULT_ENCODING= "US-ASCII".equals(ResourcesPlugin.getEncoding()) ? "ISO-8859-1" : "US-ASCII";
 	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
 
@@ -94,7 +98,6 @@ public void tearDown() throws Exception {
 		fEditor= null;
 		fFile= null;
 		ResourceHelper.deleteProject("EncodingChangeTestProject");
-		TestUtil.cleanUp();
 	}
 
 	@Test
@@ -186,4 +189,4 @@ public void testAInvalidEncoding() {
 			fail();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
index c9390e31e32..0650c5c6668 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
@@ -24,6 +24,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.widgets.Display;
@@ -73,6 +74,9 @@
  */
 public class FileDocumentProviderTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private File file;
 	private AtomicBoolean stoppedByTest;
 	private AtomicBoolean stopLockingFlag;
@@ -136,8 +140,6 @@ public void tearDown() throws Exception {
 			page.closeEditor(editor, false);
 		}
 		ResourceHelper.deleteProject(file.getProject().getName());
-		TestUtil.runEventLoop();
-		TestUtil.cleanUp();
 	}
 
 	@Test
@@ -432,4 +434,4 @@ public IStatus run2() {
 		}
 		return Status.OK_STATUS;
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FindNextActionTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FindNextActionTest.java
index 20a94932238..481604046a1 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FindNextActionTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FindNextActionTest.java
@@ -22,6 +22,7 @@
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
 
@@ -52,6 +53,10 @@
 import org.eclipse.ui.texteditor.FindReplaceAction;
 
 public class FindNextActionTest {
+
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static final String TEST_PROJECT_NAME = "TestProject";
 
 	private static final String BUNDLE_FOR_CONSTRUCTED_KEYS_NAME = "org.eclipse.ui.texteditor.ConstructedEditorMessages";//$NON-NLS-1$
@@ -103,7 +108,6 @@ public void tearDown() throws Exception {
 		editor = null;
 		project.delete(true, null);
 		project = null;
-		TestUtil.cleanUp();
 	}
 
 	private void resetInitialSearchSettings() {
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
index 69dcf0a3e9d..24aa561b285 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
@@ -18,6 +18,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -53,6 +54,9 @@
  */
 public class GotoLineTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
 
 	private IFile fFile;
@@ -71,7 +75,6 @@ public void setUp() throws Exception {
 	public void tearDown() throws Exception {
 		ResourceHelper.deleteProject("GoToLineTestProject");
 		fFile= null;
-		TestUtil.cleanUp();
 	}
 
 	@Test
@@ -122,4 +125,4 @@ private void goToLine(int line, int expectedResult) {
 			fail();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/LargeFileTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/LargeFileTest.java
index 482890e91f5..89af7dd5322 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/LargeFileTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/LargeFileTest.java
@@ -19,6 +19,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.widgets.Display;
@@ -51,6 +52,9 @@
  */
 public class LargeFileTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private IFile fLargeFile;
 
 	private IPreferenceStore preferenceStore;
@@ -84,7 +88,6 @@ public void tearDown() throws Exception {
 		ResourceHelper.deleteProject("LargeFileTestProject");
 		fLargeFile= null;
 		preferenceStore.setValue(AbstractTextEditor.PREFERENCE_WORD_WRAP_ENABLED, initialWordWrap);
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
index ff29e629a33..92267bc5ad4 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
@@ -22,6 +22,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
@@ -46,6 +47,9 @@
 
 public class MarkerAnnotationOrderTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	IContributor pointContributor= null;
 
 	Object masterToken= null;
@@ -81,7 +85,6 @@ public void tearDown() throws Exception {
 				registry.removeExtension(extension, masterToken);
 			}
 		}
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
index ad18843a6ec..3923af33705 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
@@ -19,6 +19,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -44,6 +45,9 @@
 
 public class SegmentedModeTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static final String ORIGINAL_CONTENT= "this\nis\nthe\ncontent\nof\nthe\nfile";
 
 	private IFile fFile;
@@ -61,7 +65,6 @@ public void setUp() throws Exception {
 	@After
 	public void tearDown() throws Exception {
 		ResourceHelper.deleteProject("project");
-		TestUtil.cleanUp();
 	}
 
 	/*
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java
index e08f70099a2..4cf067e0c19 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/StatusEditorTest.java
@@ -22,6 +22,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.CTabFolder;
@@ -51,6 +52,10 @@
 import org.eclipse.ui.editors.text.TextEditor;
 
 public class StatusEditorTest {
+
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private IWorkbenchWindow window;
 	private Display display;
 	private IWorkbenchPage page;
@@ -67,8 +72,6 @@ public void before() throws WorkbenchException {
 	public void after() {
 		window.close();
 		page = null;
-		processEvents();
-		TestUtil.cleanUp();
 	}
 
 	/*
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TestUtil.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TestUtil.java
index a4a31614bb7..616f453fc21 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TestUtil.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TestUtil.java
@@ -13,31 +13,11 @@
  *******************************************************************************/
 package org.eclipse.ui.editors.tests;
 
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Assert;
-
 import org.eclipse.swt.widgets.Display;
 
 import org.eclipse.core.runtime.jobs.Job;
 
 public class TestUtil {
-	/**
-	 * Call this in the tearDown method of every test to clean up state that can
-	 * otherwise leak through SWT between tests.
-	 */
-	public static void cleanUp() {
-		// Ensure that the Thread.interrupted() flag didn't leak.
-		Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
-		// Wait for any outstanding jobs to finish. Protect against deadlock by
-		// terminating the wait after a timeout.
-		boolean timedOut = waitForJobs(0, TimeUnit.MINUTES.toMillis(3));
-		Assert.assertFalse("Some Job did not terminate at the end of the test", timedOut);
-		// Wait for any pending *syncExec calls to finish
-		runEventLoop();
-		// Ensure that the Thread.interrupted() flag didn't leak.
-		Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
-	}
 
 	/**
 	 * Process all queued UI events. If called from background thread, does
@@ -91,4 +71,23 @@ public static boolean waitForJobs(long minTimeMs, long maxTimeMs) {
 		}
 		return false;
 	}
-}
+
+	/**
+	 * JUnit 4 rule to clean up state that can otherwise leak through SWT between
+	 * tests.
+	 */
+	public static class CleanupRule extends org.junit.rules.ExternalResource {
+		@Override
+		protected void after() {
+			// Ensure that the Thread.interrupted() flag didn't leak.
+			org.junit.Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
+			// Wait for any outstanding jobs to finish. Protect against deadlock by terminating the wait after a timeout.
+			boolean timedOut = waitForJobs(0, java.util.concurrent.TimeUnit.MINUTES.toMillis(3));
+			org.junit.Assert.assertFalse("Some Job did not terminate at the end of the test", timedOut);
+			// Wait for any pending *syncExec calls to finish
+			runEventLoop();
+			// Ensure that the Thread.interrupted() flag didn't leak.
+			org.junit.Assert.assertFalse("The main thread should not be interrupted at the end of a test", Thread.interrupted());
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
index 15480d8a894..c17fbc3cbf2 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
@@ -25,6 +25,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.widgets.Display;
@@ -57,6 +58,9 @@
  */
 public class TextFileDocumentProviderTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private File file;
 	private AtomicBoolean stoppedByTest;
 	private AtomicBoolean stopLockingFlag;
@@ -120,8 +124,6 @@ public void tearDown() throws Exception {
 			page.closeEditor(editor, false);
 		}
 		ResourceHelper.deleteProject(file.getProject().getName());
-		TestUtil.runEventLoop();
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretNavigationTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretNavigationTest.java
index b742e823130..9683db81e0b 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretNavigationTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretNavigationTest.java
@@ -19,6 +19,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -47,6 +48,9 @@
  */
 public class TextMultiCaretNavigationTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static File file;
 	private static AbstractTextEditor editor;
 	private static StyledText widget;
@@ -63,7 +67,6 @@ public void setUpBeforeClass() throws IOException, PartInitException, CoreExcept
 	public void tearDown() {
 		editor.close(false);
 		file.delete();
-		TestUtil.cleanUp();
 	}
 
 
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
index 2fc1ee73331..e02a2313504 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretSelectionCommandsTest.java
@@ -23,6 +23,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -52,6 +53,10 @@
  * an editor from this bundle is quite tricky without the IDE and EFS utils.
  */
 public class TextMultiCaretSelectionCommandsTest {
+
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static final String MULTI_SELECTION_DOWN = "org.eclipse.ui.edit.text.select.selectMultiSelectionDown";
 	private static final String ADD_ALL_MATCHES_TO_MULTI_SELECTION = "org.eclipse.ui.edit.text.select.addAllMatchesToMultiSelection";
 	private static final String MULTI_SELECTION_UP = "org.eclipse.ui.edit.text.select.selectMultiSelectionUp";
@@ -87,7 +92,6 @@ public void setUpBeforeClass() throws IOException, PartInitException, CoreExcept
 	public void tearDown() {
 		editor.close(false);
 		file.delete();
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextNavigationTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextNavigationTest.java
index 7724383c598..79586555dfa 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextNavigationTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextNavigationTest.java
@@ -21,6 +21,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -52,6 +53,9 @@
  */
 public class TextNavigationTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private File file;
 	private AbstractTextEditor editor;
 	private StyledText widget;
@@ -70,7 +74,6 @@ public void setUp() throws IOException, PartInitException, CoreException {
 	public void tearDown() {
 		editor.close(false);
 		file.delete();
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ZoomTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ZoomTest.java
index a457c3ed4b0..3af91fbf79f 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ZoomTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ZoomTest.java
@@ -21,6 +21,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.custom.StyledText;
@@ -48,6 +49,9 @@
  */
 public class ZoomTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private static IProject project;
 	private static IFile file;
 	private StyledText text;
@@ -67,7 +71,6 @@ public static void setUpBeforeClass() throws Exception {
 	public static void tearDownAfterClass() throws Exception {
 		file.delete(true, new NullProgressMonitor());
 		project.delete(true, new NullProgressMonitor());
-		TestUtil.cleanUp();
 	}
 
 	@Before
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/DefaultStickyLinesProviderTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/DefaultStickyLinesProviderTest.java
index ad8eed162ea..8df788a2dfd 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/DefaultStickyLinesProviderTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/DefaultStickyLinesProviderTest.java
@@ -21,8 +21,8 @@
 
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.SWT;
@@ -46,6 +46,9 @@
 
 public class DefaultStickyLinesProviderTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private Shell shell;
 	private SourceViewer sourceViewer;
 	private DefaultStickyLinesProvider stickyLinesProvider;
@@ -64,11 +67,6 @@ public void setup() {
 		stickyLinesProperties = new StickyLinesProperties(4, editorPart);
 	}
 
-	@After
-	public void teardown() {
-		TestUtil.cleanUp();
-	}
-
 	@Test
 	public void testEmptySourceCode() {
 		List<IStickyLine> stickyLines = stickyLinesProvider.getStickyLines(sourceViewer, 0, stickyLinesProperties);
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderRegistryTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderRegistryTest.java
index d3fa25e72a6..75abb6f5a3c 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderRegistryTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLinesProviderRegistryTest.java
@@ -8,8 +8,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -24,6 +24,9 @@
 
 public class StickyLinesProviderRegistryTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private StickyLinesProviderDescriptor stickyLinesProviderDescriptor;
 	private StickyLinesProviderRegistry cut;
 	private ISourceViewer viewer;
@@ -43,10 +46,6 @@ public void setup() {
 		cut = new StickyLinesProviderRegistry(extensionRegistry, e -> stickyLinesProviderDescriptor);
 	}
 
-	@After
-	public void teardown() {
-		TestUtil.cleanUp();
-	}
 
 	@Test
 	public void testGetDefaultProviderIfNoMatch() {
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java
index 200de84a31a..353a4a819ae 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java
@@ -24,6 +24,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.SWT;
@@ -52,6 +53,9 @@
 
 public class StickyScrollingControlTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private Shell shell;
 	private SourceViewer sourceViewer;
 	private Color lineNumberColor;
@@ -88,7 +92,6 @@ public void teardown() {
 		lineNumberColor.dispose();
 		hoverColor.dispose();
 		backgroundColor.dispose();
-		TestUtil.cleanUp();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java
index 411a2b73fee..ad3b1bc83b3 100644
--- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java
+++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java
@@ -34,6 +34,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import org.eclipse.swt.SWT;
@@ -63,6 +64,9 @@
 
 public class StickyScrollingHandlerTest {
 
+	@Rule
+	public TestUtil.CleanupRule cleanup = new TestUtil.CleanupRule();
+
 	private Shell shell;
 	private SourceViewer sourceViewer;
 	private Color lineNumberColor;
@@ -101,7 +105,6 @@ public void setup() {
 	@After
 	public void teardown() {
 		shell.dispose();
-		TestUtil.cleanUp();
 	}
 
 	@Test