diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index fc908ee8a8..c1b9939385 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,12 +43,12 @@ jobs:
     - name: Build m2e-core
       uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
       with:
-       run: mvn clean verify -Pits -Dtycho.p2.baselineMode=failCommon --batch-mode
+       run: mvn clean verify --batch-mode -Pits -Dtycho.p2.baselineMode=failCommon -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
     - name: Upload Test Results
       uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       with:
         name: test-results-${{ matrix.os }}
-        if-no-files-found: error
+        if-no-files-found: warn
         path: |
           ${{ github.workspace }}/**/target/surefire-reports/*.xml
   event_file:
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index c294ebc634..ff2889110d 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho-build</artifactId>
-    <version>4.0.4</version>
+    <version>${tycho-version}</version>
   </extension>
 </extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
index d3993fab49..4bb3874742 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -2,6 +2,7 @@
 --errors
 --update-snapshots
 --no-transfer-progress
--Dmaven.test.error.ignore=true
--Dmaven.test.failure.ignore=true
--Dtycho.target.pomDependencies=consider
\ No newline at end of file
+--fail-at-end
+-Dtycho.localArtifacts=ignore
+-Dtycho.target.pomDependencies=consider
+-Dtycho-version=4.0.4
diff --git a/Jenkinsfile b/Jenkinsfile
index 01b1221d0c..57a4db1664 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
 				withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
 				xvnc(useXauthority: true) {
 					sh '''
-						mavenArgs="clean verify -Dtycho.p2.baselineMode=failCommon --batch-mode"
+						mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon"
 						if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then
 							mvn ${mavenArgs} -Peclipse-sign,its -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79"
 						else
diff --git a/m2e-parent/pom.xml b/m2e-parent/pom.xml
index 08ef804ed9..c35f0d8368 100644
--- a/m2e-parent/pom.xml
+++ b/m2e-parent/pom.xml
@@ -23,7 +23,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>4.0.4</tycho-version>
 		<tycho.p2.baselineMode>warn</tycho.p2.baselineMode>
 		<scmConnectionRaw>scm:git:https://github.com/eclipse-m2e/m2e-core.git</scmConnectionRaw>
 	</properties>
diff --git a/setup/tychoSnapshotSettings.xml b/setup/tychoSnapshotSettings.xml
index 8e1c5bb05d..12a9069685 100644
--- a/setup/tychoSnapshotSettings.xml
+++ b/setup/tychoSnapshotSettings.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0	https://maven.apache.org/xsd/settings-1.0.0.xsd">
 	<!-- This Maven-settings file allows to test Tycho snapshots without the need to install them into the local Maven repository 
 		and thus makes it possible to test snapshots of Tycho's extension in the CI.
-		To use it, add the following arguments to the Maven command: -s setup/tychoSnapshotSettings.xml -U -->
+		To use it, add the following line of arguments to the '.mvn/maven.config' file: -s setup/tychoSnapshotSettings.xml -U -->
 	<profiles>
 		<profile>
 			<id>tycho-snapshots</id>