diff --git a/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
index 562aa8dcd70..58e2df3058b 100644
--- a/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.editors.tests;singleton:=true
-Bundle-Version: 3.13.800.qualifier
+Bundle-Version: 3.13.900.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface.text.tests.codemining,
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 558572147f0..f20ccbb2d38 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
@@ -55,6 +55,8 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 
+import org.eclipse.ui.editors.tests.TestUtil;
+
 public class CodeMiningTest {
 	private static String PROJECT_NAME = "test_" + new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
 
@@ -78,6 +80,7 @@ public void after() {
 		drainEventQueue();
 		CodeMiningTestProvider.provideContentMiningAtOffset = -1;
 		CodeMiningTestProvider.provideHeaderMiningAtLine = -1;
+		TestUtil.cleanUp();
 	}
 
 	private static void closeAllEditors() {
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 d05ed834816..e08f70099a2 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
@@ -68,6 +68,7 @@ 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/TextMultiCaretNavigationTest.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextMultiCaretNavigationTest.java
index eee388dc452..b742e823130 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
@@ -61,8 +61,9 @@ public void setUpBeforeClass() throws IOException, PartInitException, CoreExcept
 
 	@After
 	public void tearDown() {
-		editor.dispose();
+		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 85b43634ae8..2fc1ee73331 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
@@ -85,8 +85,9 @@ public void setUpBeforeClass() throws IOException, PartInitException, CoreExcept
 
 	@After
 	public void tearDown() {
-		editor.dispose();
+		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 0f59a098cb6..7724383c598 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
@@ -68,8 +68,9 @@ public void setUp() throws IOException, PartInitException, CoreException {
 
 	@After
 	public void tearDown() {
-		editor.dispose();
+		editor.close(false);
 		file.delete();
+		TestUtil.cleanUp();
 	}
 
 	@Test
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 87102871347..ad8eed162ea 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,6 +21,7 @@
 
 import java.util.List;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -41,6 +42,8 @@
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLine;
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider.StickyLinesProperties;
 
+import org.eclipse.ui.editors.tests.TestUtil;
+
 public class DefaultStickyLinesProviderTest {
 
 	private Shell shell;
@@ -61,6 +64,11 @@ 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 165647e49bb..d3fa25e72a6 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,6 +8,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -19,6 +20,8 @@
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider;
 
+import org.eclipse.ui.editors.tests.TestUtil;
+
 public class StickyLinesProviderRegistryTest {
 
 	private StickyLinesProviderDescriptor stickyLinesProviderDescriptor;
@@ -40,6 +43,11 @@ public void setup() {
 		cut = new StickyLinesProviderRegistry(extensionRegistry, e -> stickyLinesProviderDescriptor);
 	}
 
+	@After
+	public void teardown() {
+		TestUtil.cleanUp();
+	}
+
 	@Test
 	public void testGetDefaultProviderIfNoMatch() {
 		when(stickyLinesProviderDescriptor.matches(viewer, editor)).thenReturn(false);
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 a13f9f5c02a..200de84a31a 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
@@ -48,6 +48,8 @@
 
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLine;
 
+import org.eclipse.ui.editors.tests.TestUtil;
+
 public class StickyScrollingControlTest {
 
 	private Shell shell;
@@ -86,6 +88,7 @@ public void teardown() {
 		lineNumberColor.dispose();
 		hoverColor.dispose();
 		backgroundColor.dispose();
+		TestUtil.cleanUp();
 	}
 
 	@Test
@@ -183,13 +186,17 @@ public void testCopyStyleRangesWithLimitedStickyLines() {
 
 	@Test
 	public void testWithoutVerticalRuler() {
-		sourceViewer = new SourceViewer(shell, null, SWT.None);
-		settings = new StickyScrollingControlSettings(5, lineNumberColor, hoverColor, backgroundColor, separatorColor,
-				true);
-		stickyScrollingControl = new StickyScrollingControl(sourceViewer, settings);
-
-		StyledText stickyLineNumber = getStickyLineNumber();
-		assertFalse(stickyLineNumber.isVisible());
+		SourceViewer sourceViewerWithoutRuler = new SourceViewer(shell, null, SWT.None);
+		StickyScrollingControl stickyScrollingControlWithoutRuler = new StickyScrollingControl(sourceViewerWithoutRuler,
+				new StickyScrollingControlSettings(5, lineNumberColor, hoverColor, backgroundColor, separatorColor,
+						true));
+		try {
+			StyledText stickyLineNumber = getStickyLineNumber();
+			assertFalse(stickyLineNumber.isVisible());
+		} finally {
+			sourceViewerWithoutRuler.getControl().dispose();
+			stickyScrollingControlWithoutRuler.dispose();
+		}
 	}
 
 	@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 24bd8d9ce04..411a2b73fee 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
@@ -59,6 +59,8 @@
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider;
 import org.eclipse.ui.texteditor.stickyscroll.IStickyLinesProvider.StickyLinesProperties;
 
+import org.eclipse.ui.editors.tests.TestUtil;
+
 public class StickyScrollingHandlerTest {
 
 	private Shell shell;
@@ -99,6 +101,7 @@ public void setup() {
 	@After
 	public void teardown() {
 		shell.dispose();
+		TestUtil.cleanUp();
 	}
 
 	@Test