diff --git a/pom.xml b/pom.xml
index 51dad97394ee08a2a949747e2339d997ee7eb08e..17b9880fd85d9a7a7e823826eca434aa53ce45a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.2.5</version>
+				<configuration>
+                <!-- Disable parallel execution -->
+                	<parallel>none</parallel>
+            	</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
@@ -458,11 +462,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.2.5</version>
-			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
index 048ad19c20ee3c49ee427bf373885f4daa118d15..db51361f50c3dc04724dea3a43d21cdfd33304fa 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
@@ -17,6 +17,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -36,6 +37,7 @@ import org.springframework.web.context.WebApplicationContext;
 @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("testing")
+@AutoConfigureTestDatabase //this automatically uses h2
 public class HubApiControllerTest {
 
     @Autowired
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
index c8ed3f474d664be8bc421378cd331111f479c8b2..be25caffe40d26ac1f86ca3e09c9ebfa1026bccc 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ import org.springframework.web.context.WebApplicationContext;
 @Transactional
 @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
 @AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
 @ActiveProfiles("testing")
 public class ServiceCandidateApiControllerTest {
 
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
index 92b48d54028defe00acaa5f26c1f1f55f3f38219..65080e81409bd9ae8d8b6ad263ec0b4613a51484 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ import org.springframework.web.context.WebApplicationContext;
 @Transactional
 @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
 @AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
 @ActiveProfiles("testing")
 public class ServiceCatalogApiControllerTest {
 
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
index 865ca45fc3cb0b2f30ac468a7ea1fbbe92f92606..4163c54fc4a5df05824c25afcd094ababd8dc869 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
@@ -16,6 +16,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -34,6 +35,7 @@ import org.springframework.web.context.WebApplicationContext;
 @Transactional
 @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
 @AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
 @ActiveProfiles("testing")
 
 public class ServiceCategoryApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
index 305d454c0c3391b3f454e05b56e7a0d72d6e45b0..ac1dad1cfe692094e836921057e074dba76fceb0 100644
--- a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
@@ -31,6 +31,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -50,7 +51,7 @@ import org.springframework.web.context.WebApplicationContext;
         webEnvironment = SpringBootTest.WebEnvironment.MOCK,
         classes = OpenAPISpringBoot.class
 )
-//@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureTestDatabase //this automatically uses h2
 @AutoConfigureMockMvc
 @ActiveProfiles("testing")
 public class ServiceOrderApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
index 2cc5b0e9f819bc1a94867eeeca9afb03773014bf..dc3a7c1e1367410141b4f0c1f78d571ab30b4618 100644
--- a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
+++ b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
@@ -45,7 +46,7 @@ import org.springframework.web.context.WebApplicationContext;
         webEnvironment = SpringBootTest.WebEnvironment.MOCK,
         classes = OpenAPISpringBoot.class
 )
-//@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureTestDatabase //this automatically uses h2
 @AutoConfigureMockMvc
 @ActiveProfiles("testing")
 public class ServiceOrderRepoServiceTest {
diff --git a/src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java b/src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
similarity index 98%
rename from src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java
rename to src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
index fbd4718e3c0840e3b14a275059ee1f94a871a7d4..29ea3bde1c624ee38a98240ce67fc30710ce83cc 100644
--- a/src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java
+++ b/src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
@@ -37,21 +37,25 @@ import org.mockito.Mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 @RunWith(SpringRunner.class)
+@Transactional
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = OpenAPISpringBoot.class)
+@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureMockMvc
 @ActiveProfiles("testing")
-@SpringBootTest(classes = OpenAPISpringBoot.class)
-//@DataJpaTest
-public class ServiceRepoServiceTest {
+public class ServiceNSLCMRepoServiceTest {
 
     @Mock
     private ServiceRepository serviceRepository;