diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7be37cd05ae..4e7f33b8f38 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,14 +51,15 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5
       with:
-        maven-version: 3.9.2
+        maven-version: 3.9.6
     - name: Build with Maven
       uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
       with:
        run: >-
         mvn --batch-mode -V -U
         -DforkCount=1
-        -Dcompare-version-with-baselines.skip=false
+        -Dcompare-version-with-baselines.skip=true
+        -Dtycho.baseline.replace=none
         -Dmaven.compiler.failOnWarning=true
         --fail-at-end
         -DskipNativeTests=false
diff --git a/Jenkinsfile b/Jenkinsfile
index 45ad3af5beb..5f141f186df 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -347,6 +347,7 @@ pipeline {
 							mvn clean verify \
 								--batch-mode -DforkCount=0 \
 								-Dcompare-version-with-baselines.skip=false -Dmaven.compiler.failOnWarning=true \
+								-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
 								-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true
 						'''
 					}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java
index afaed03e58a..4334095ed0a 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java	
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java	
@@ -19,11 +19,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.junit.Test;
-
 import java.nio.file.Paths;
 import java.security.CodeSigner;
 import java.security.cert.Certificate;
@@ -31,6 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.SWTException;
+import org.junit.Assume;
+import org.junit.Test;
+
 /**
  * Automated Test Suite for class org.eclipse.swt.SWT
  *
@@ -166,9 +167,7 @@ private List<String> signersFromClass(Class<?> classValue) {
 @Test
 public void test_isLocal() {
 	// If you change default to NO, make sure that this test runs on GitHub
-	if (Boolean.getBoolean("org.eclipse.swt.tests.junit.disable.test_isLocal")) {
-		return;
-	}
+	Assume.assumeFalse(Boolean.getBoolean("org.eclipse.swt.tests.junit.disable.test_isLocal"));
 
 	String swtPath = pathFromClass(SWT.class);
 	String tstPath = pathFromClass(Test_org_eclipse_swt_SWT.class);