diff --git a/pom.xml b/pom.xml
index bd9cf55670..b86b1864a7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	<properties>
 		<tycho-version>2.7.5</tycho-version>
 		<tychoExtrasVersion>${tycho-version}</tychoExtrasVersion>
-		<eclipse-target-site>https://download.eclipse.org/releases/2023-09/</eclipse-target-site>
+		<eclipse-target-site>https://download.eclipse.org/staging/2023-09/</eclipse-target-site>
 		<swtbot-update-site>https://download.eclipse.org/technology/swtbot/snapshots/</swtbot-update-site>
         <!-- when making final release, switch from S to R latest update site - https://github.com/eclipse/reddeer/issues/2100 -->
         <!--eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-R/</eclipse-orbit-update-site-->
diff --git a/tests/org.eclipse.reddeer.e4.workbench.test/src/org/eclipse/reddeer/e4/workbench/test/part/WorkbenchPartTest.java b/tests/org.eclipse.reddeer.e4.workbench.test/src/org/eclipse/reddeer/e4/workbench/test/part/WorkbenchPartTest.java
index 17c1c9f267..2d64ec2815 100644
--- a/tests/org.eclipse.reddeer.e4.workbench.test/src/org/eclipse/reddeer/e4/workbench/test/part/WorkbenchPartTest.java
+++ b/tests/org.eclipse.reddeer.e4.workbench.test/src/org/eclipse/reddeer/e4/workbench/test/part/WorkbenchPartTest.java
@@ -15,11 +15,12 @@
 
 import org.eclipse.reddeer.common.exception.RedDeerException;
 import org.eclipse.reddeer.common.matcher.RegexMatcher;
-import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.common.wait.WaitUntil;
 import org.eclipse.reddeer.core.matcher.WithTextMatcher;
 import org.eclipse.reddeer.junit.runner.RedDeerSuite;
 import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
 import org.eclipse.reddeer.swt.impl.menu.ShellMenuItem;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
 import org.eclipse.reddeer.swt.impl.table.DefaultTable;
 import org.eclipse.reddeer.swt.impl.table.DefaultTableItem;
 import org.eclipse.reddeer.swt.impl.text.DefaultText;
@@ -98,13 +99,14 @@ public void testPartAsReferencedComposite() {
 	
 	@Test
 	public void getWidgetFromPartWhenOtherShellIsActive() {
-		new ShellMenuItem("Help","About");
-		new WaitWhile(new ShellIsAvailable("About"));
+		new ShellMenuItem("Help","About").select();
+		new WaitUntil(new ShellIsAvailable("About"));
 		
 		try {
 			new DefaultTableItem("Sample item 1");
 		} catch (RedDeerException e) {
 			//not found which is ok because About shell is open
+			new DefaultShell("About").close();
 			return;
 		}
 		fail();
diff --git a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/wizards/JavaProjectWizardTest.java b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/wizards/JavaProjectWizardTest.java
index 13bb20b201..c54d554035 100644
--- a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/wizards/JavaProjectWizardTest.java
+++ b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jdt/ui/wizards/JavaProjectWizardTest.java
@@ -107,7 +107,7 @@ public void testJavaProjectWizardCreateInfoModule() {
 		
 		NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
 		pageOne.setProjectName(JAVA_PROJECT);
-		pageOne.useExecutionEnvironmentJRE("JavaSE-11");
+		pageOne.useExecutionEnvironmentJRE("JavaSE-17");
 		new WaitUntil(new JobIsRunning(), TimePeriod.MEDIUM, false);
 		new WaitWhile(new JobIsRunning(), TimePeriod.MEDIUM, false);
 		pageOne.createModuleInfoFile(true);
@@ -129,7 +129,7 @@ public void testJavaProjectWizardCreateInfoModuleDefaultName() {
 		
 		NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
 		pageOne.setProjectName(JAVA_PROJECT);
-		pageOne.useExecutionEnvironmentJRE("JavaSE-11");
+		pageOne.useExecutionEnvironmentJRE("JavaSE-17");
 		pageOne.createModuleInfoFile(true);
 		
 		dialog.finish();
@@ -148,7 +148,7 @@ public void testJavaProjectWizardDisabledModuleInfoCheckbox() {
 		
 		NewJavaProjectWizardPageOne pageOne = new NewJavaProjectWizardPageOne(dialog);
 		pageOne.setProjectName(JAVA_PROJECT);
-		pageOne.useExecutionEnvironmentJRE("JavaSE-1.8");
+		pageOne.useExecutionEnvironmentJRE("JavaSE-17");
 		try {
 			pageOne.createModuleInfoFile(true);
 		} catch (WaitTimeoutExpiredException exc) {
diff --git a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jst/j2ee/ui/project/facet/EARProjectWizardTest.java b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jst/j2ee/ui/project/facet/EARProjectWizardTest.java
index f39621b0f6..77c4408808 100644
--- a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jst/j2ee/ui/project/facet/EARProjectWizardTest.java
+++ b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/jst/j2ee/ui/project/facet/EARProjectWizardTest.java
@@ -93,7 +93,7 @@ public void createProjectWithWebModule(){
 		ear.open();
 		EarProjectFirstPage fp = new EarProjectFirstPage(ear);
 		fp.setProjectName(projectName);
-		fp.setEARVersion("8.0");
+		fp.setEARVersion("10.0");
 		ear.next();
 		EarProjectInstallPage ip = new EarProjectInstallPage(ear);
 		assertFalse(ip.isGenerateApplicationXML());
diff --git a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/m2e/core/ui/preferences/MavenPreferencePageTest.java b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/m2e/core/ui/preferences/MavenPreferencePageTest.java
index 904c41f731..a08ec11e14 100644
--- a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/m2e/core/ui/preferences/MavenPreferencePageTest.java
+++ b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/m2e/core/ui/preferences/MavenPreferencePageTest.java
@@ -34,7 +34,7 @@ public void checkAllPreferences() {
 		preferencesDialog.select(mavenPreferencePage);
 		
 		mavenPreferencePage.setDebugOutput(true);
-		mavenPreferencePage.setDoNotAutoUpdateDeps(true);
+//		mavenPreferencePage.setDoNotAutoUpdateDeps(true); # is not a part of 2023-09 Eclipse
 		mavenPreferencePage.setDownloadArtifactJavadoc(true);
 		mavenPreferencePage.setDownloadArtifactSources(true);
 		mavenPreferencePage.setDownloadRepoIndexOnStartup(true);
@@ -43,7 +43,7 @@ public void checkAllPreferences() {
 		mavenPreferencePage.setUpdateMavenProjectsOnStartup(true);
 		
 		assertTrue(mavenPreferencePage.isDebugOutputChecked());
-		assertTrue(mavenPreferencePage.isDoNotAutoUpdateDepsChecked());
+//		assertTrue(mavenPreferencePage.isDoNotAutoUpdateDepsChecked()); # is not a part of 2023-09 Eclipse
 		assertTrue(mavenPreferencePage.isDownloadArtifactJavadocChecked());
 		assertTrue(mavenPreferencePage.isDownloadArtifactSourcesChecked());
 		assertTrue(mavenPreferencePage.isDownloadRepoIndexOnStartupChecked());
@@ -60,7 +60,7 @@ public void uncheckAllPreferences() {
 		preferencesDialog.select(mavenPreferencePage);
 		
 		mavenPreferencePage.setDebugOutput(false);
-		mavenPreferencePage.setDoNotAutoUpdateDeps(false);
+//		mavenPreferencePage.setDoNotAutoUpdateDeps(false); # is not a part of 2023-09 Eclipse
 		mavenPreferencePage.setDownloadArtifactJavadoc(false);
 		mavenPreferencePage.setDownloadArtifactSources(false);
 		mavenPreferencePage.setDownloadRepoIndexOnStartup(false);
@@ -69,7 +69,7 @@ public void uncheckAllPreferences() {
 		mavenPreferencePage.setUpdateMavenProjectsOnStartup(false);
 		
 		assertFalse(mavenPreferencePage.isDebugOutputChecked());
-		assertFalse(mavenPreferencePage.isDoNotAutoUpdateDepsChecked());
+//		assertFalse(mavenPreferencePage.isDoNotAutoUpdateDepsChecked()); # is not a part of 2023-09 Eclipse
 		assertFalse(mavenPreferencePage.isDownloadArtifactJavadocChecked());
 		assertFalse(mavenPreferencePage.isDownloadArtifactSourcesChecked());
 		assertFalse(mavenPreferencePage.isDownloadRepoIndexOnStartupChecked());
diff --git a/tests/pom.xml b/tests/pom.xml
index 4256a61953..979cc9db35 100755
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -64,7 +64,7 @@
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>false</useUIThread>
 					<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
-					<argLine>-DlogMessageFilter=${logMessageFilter} -DpauseFailedTest=${pauseFailedTest} -DrelativeScreenshotDirectory=${relativeScreenshotDirectory} ${platformSystemProperties} ${customArgLine} ${junitExtensionsProperties} ${tycho.testArgLine} -Xmx512m</argLine>
+					<argLine>-DlogMessageFilter=${logMessageFilter} -DpauseFailedTest=${pauseFailedTest} -DrelativeScreenshotDirectory=${relativeScreenshotDirectory} ${platformSystemProperties} ${customArgLine} ${junitExtensionsProperties} ${tycho.testArgLine} -Xmx1024m</argLine>
 					<product>org.eclipse.platform.ide</product>
 					<application>org.eclipse.ui.ide.workbench</application>
 					<dependencies combine.children="append">