diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index fc32d1628e9..3f947375d11 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -296,6 +296,7 @@ under the License.
       <properties>
         <maven.build.cache.skipCache>true</maven.build.cache.skipCache>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index e1369bd4137..1b359201117 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -267,6 +267,7 @@ under the License.
       <properties>
         <maven.build.cache.skipCache>true</maven.build.cache.skipCache>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
diff --git a/core/self-keymaster-starter/pom.xml b/core/self-keymaster-starter/pom.xml
index c93954bb40c..457ed80b248 100644
--- a/core/self-keymaster-starter/pom.xml
+++ b/core/self-keymaster-starter/pom.xml
@@ -100,6 +100,7 @@ under the License.
       <properties>
         <maven.build.cache.skipCache>true</maven.build.cache.skipCache>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <dependencies>
diff --git a/ext/openfga/client-openfga/pom.xml b/ext/openfga/client-openfga/pom.xml
index d73dfde8159..c35524868cb 100644
--- a/ext/openfga/client-openfga/pom.xml
+++ b/ext/openfga/client-openfga/pom.xml
@@ -35,6 +35,7 @@ under the License.
   
   <properties>
     <skipTests>true</skipTests>
+    <skipITs>true</skipITs>
     <rootpom.basedir>${basedir}/../../..</rootpom.basedir>
   </properties>
 
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 2bba07bfe38..a8f36e302e7 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -211,15 +211,12 @@ under the License.
   </build>
 
   <profiles>
-    <profile>
-      <id>skipTests</id>
-    </profile>
-
     <profile>
       <id>debug</id>
 
       <properties>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index c9afec91c0a..9d9ee0a4dc0 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1723,7 +1723,7 @@ under the License.
             <artifactId>maven-failsafe-plugin</artifactId>
             <inherited>true</inherited>
             <configuration>
-              <skipTests>${skipTests}</skipTests>
+              <skipITs>${skipITs}</skipITs>
             </configuration>
           </plugin>
         </plugins>
@@ -1735,6 +1735,7 @@ under the License.
 
       <properties>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
@@ -1765,6 +1766,7 @@ under the License.
       
       <properties>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
       
       <build>
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
index b77027f6369..227100bbce2 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.fit.core;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -224,23 +225,21 @@ public void invalidIssuer() throws ParseException, JOSEException {
     @Test
     public void expiredToken() throws ParseException, JOSEException {
         // Get an initial token
-        SyncopeClient localClient = CLIENT_FACTORY.create(ADMIN_UNAME, ADMIN_PWD);
+        UserCR userCR = UserITCase.getUniqueSample("expired@syncope.apache.org");
+        assertDoesNotThrow(() -> createUser(userCR));
+        SyncopeClient localClient = CLIENT_FACTORY.create(userCR.getUsername(), userCR.getPassword());
         AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class);
 
         Response response = accessTokenService.login();
         String token = response.getHeaderString(RESTHeaders.TOKEN);
         assertNotNull(token);
         SignedJWT jwt = SignedJWT.parse(token);
-        String tokenId = jwt.getJWTClaimsSet().getJWTID();
 
         // Create a new token using the Id of the first token
         Date currentTime = new Date();
 
-        JWTClaimsSet.Builder claimsSet = new JWTClaimsSet.Builder().
-                jwtID(tokenId).
-                subject(ADMIN_UNAME).
+        JWTClaimsSet.Builder claimsSet = new JWTClaimsSet.Builder(jwt.getJWTClaimsSet()).
                 issueTime(currentTime).
-                issuer(JWT_ISSUER).
                 expirationTime(new Date(currentTime.getTime() - 5000L)).
                 notBeforeTime(currentTime);
         jwt = new SignedJWT(new JWSHeader(JWS_SIGNER.getJwsAlgorithm()), claimsSet.build());
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index ae62a23f223..959d015e5db 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -119,10 +119,14 @@
 import org.identityconnectors.framework.common.objects.Name;
 import org.identityconnectors.framework.common.objects.Uid;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+@TestMethodOrder(OrderAnnotation.class)
 public class PullTaskITCase extends AbstractTaskITCase {
 
     private static final String LDAP_PULL_TASK = "1e419ca4-ea81-4493-a14f-28b90113686d";
@@ -239,6 +243,7 @@ public void create() {
         assertEquals(groupTemplate, task.getTemplates().get(AnyTypeKind.GROUP.name()));
     }
 
+    @Order(1)
     @Test
     public void fromCSV() throws Exception {
         assumeFalse(IS_EXT_SEARCH_ENABLED);
@@ -408,6 +413,7 @@ public void reconcileFromDB() {
         }
     }
 
+    @Order(2)
     @Test
     public void reconcileFromLDAP() {
         assumeFalse(IS_NEO4J_PERSISTENCE);
@@ -779,6 +785,7 @@ public void syncTokenWithErrors() {
         }
     }
 
+    @Order(3)
     @Test
     public void remediation() {
         // First of all, clear any potential conflict with existing user / group
@@ -865,6 +872,7 @@ public void remediation() {
         }
     }
 
+    @Order(4)
     @Test
     public void remediationSinglePull() throws IOException {
         // First of all, clear any potential conflict with existing user / group
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
index 52b30c96650..1dfe9a61ca7 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
@@ -540,6 +540,8 @@ public void updateInvalidPassword() {
 
     @Test
     public void updateSamePassword() {
+        assumeFalse(IS_NEO4J_PERSISTENCE);
+
         assertThrows(SyncopeClientException.class, () -> {
             UserCR userCR = getUniqueSample("updatesame@password.com");
             userCR.setRealm("/even/two");
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index ffcd247aa44..0cd8017d9b8 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -212,15 +212,12 @@ under the License.
   </build>
   
   <profiles>
-    <profile>
-      <id>skipTests</id>
-    </profile>
-
     <profile>
       <id>debug</id>
 
       <properties>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
diff --git a/fit/wa-reference/pom.xml b/fit/wa-reference/pom.xml
index bf23965f167..b2721d3883f 100644
--- a/fit/wa-reference/pom.xml
+++ b/fit/wa-reference/pom.xml
@@ -393,15 +393,12 @@ under the License.
   </build>
   
   <profiles>
-    <profile>
-      <id>skipTests</id>
-    </profile>
-
     <profile>
       <id>debug</id>
 
       <properties>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
       </properties>
 
       <build>
diff --git a/pom.xml b/pom.xml
index 5b0b13d6792..4084cc550cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1799,7 +1799,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.6</version>
+          <version>3.6.0</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <encoding>utf-8</encoding>
@@ -1809,7 +1809,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.5.6</version>
+          <version>3.6.0</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <runOrder>alphabetical</runOrder>
@@ -2423,6 +2423,7 @@ under the License.
       <properties>
         <maven.build.cache.skipCache>true</maven.build.cache.skipCache>
         <skipTests>true</skipTests>
+        <skipITs>true</skipITs>
         <ianal.phase>none</ianal.phase>
         <modernizer.skip>true</modernizer.skip>
         <rat.skip>true</rat.skip>