diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 5d6df26b8..7b59ac072 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -590,9 +590,11 @@
             <argLine>-Drun.mode=test -XX:MaxMetaspaceSize=1G -Xms2G -Xmx4G -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseStringDeduplication --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.jar=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED</argLine>
             <tagsToExclude>code.external</tagsToExclude>
             <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
-            <!-- Enable parallel test execution - keep at 4 to avoid shared state issues -->
-            <parallel>true</parallel>
-            <threadCount>4</threadCount>
+            <!-- Disable parallel test execution to avoid shared database state issues -->
+            <!-- Tests share an in-memory H2 database which causes conflicts when run in parallel -->
+<!--            <parallel>true</parallel>-->
+<!--            <threadCount>4</threadCount>-->
+            <parallel>false</parallel>
         </configuration>
         <executions>
           <execution>
diff --git a/obp-commons/pom.xml b/obp-commons/pom.xml
index de9d694ff..a41f81a4e 100644
--- a/obp-commons/pom.xml
+++ b/obp-commons/pom.xml
@@ -117,9 +117,10 @@
                     <argLine>-Drun.mode=test -XX:MaxMetaspaceSize=1G -Xms2G -Xmx4G -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseStringDeduplication</argLine>
                     <tagsToExclude>code.external</tagsToExclude>
                     <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
-                    <!-- Enable parallel test execution - keep at 4 to avoid shared state issues -->
-                    <parallel>true</parallel>
-                    <threadCount>4</threadCount>
+                    <!-- Disable parallel test execution to avoid shared state issues -->
+<!--                    <parallel>true</parallel>-->
+<!--                    <threadCount>4</threadCount>-->
+                    <parallel>false</parallel>
                 </configuration>
                 <executions>
                     <execution>