diff --git a/.github/workflows/build-integtests-wizard.yml b/.github/workflows/build-integtests-wizard.yml
index 933fef7c..e0642d6d 100644
--- a/.github/workflows/build-integtests-wizard.yml
+++ b/.github/workflows/build-integtests-wizard.yml
@@ -19,3 +19,9 @@ jobs:
           java-version: 17
       - name: Build
         run: xvfb-run scripts/integrationtests-wizard.sh
+      - name: Archive UI Tests Screenshots
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: screenshots-${{ runner.os }}
+          path: '**/screenshots'
diff --git a/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/PackageExplorerAPI.java b/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/PackageExplorerAPI.java
index e36b4fc3..43f5bed1 100644
--- a/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/PackageExplorerAPI.java
+++ b/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/PackageExplorerAPI.java
@@ -116,7 +116,7 @@ public void deleteAllProjects() {
 		SWTBot shellBot = shell.bot();
 		shellBot.checkBox().click();
 		shellBot.button("OK").click();
-		shell.waitUntilClosed(1000 * 30);
+		shell.waitUntilClosed();
 	}
 
 	private void deleteMavenProjects() {
diff --git a/integrationtests/org.eclipse.xtext.swtbot.tests/pom.xml b/integrationtests/org.eclipse.xtext.swtbot.tests/pom.xml
index cefc102c..7001ed95 100644
--- a/integrationtests/org.eclipse.xtext.swtbot.tests/pom.xml
+++ b/integrationtests/org.eclipse.xtext.swtbot.tests/pom.xml
@@ -20,7 +20,7 @@
 				<configuration>
 					<useUIThread>false</useUIThread>
 					<useUIHarness>true</useUIHarness>
-					<argLine>${memory-settings} ${os-jvm-flags} ${surefire-jvmargs} -Dorg.eclipse.swtbot.keyboard.layout=EN_US -Dorg.eclipse.swtbot.playback.delay=20</argLine>
+					<argLine>${memory-settings} ${os-jvm-flags} ${surefire-jvmargs} -Dorg.eclipse.swtbot.keyboard.layout=EN_US -Dorg.eclipse.swtbot.playback.delay=20 -Dorg.eclipse.swtbot.search.timeout=20000</argLine>
 					<appArgLine>-pluginCustomization ${basedir}/pluginCustomization.ini</appArgLine>
 					<includes>
 						<include>**/*Test.java</include>