diff --git a/pom.xml b/pom.xml
index 5266dee52..5d3102cf9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -111,43 +111,6 @@
 				</repository>
 			</repositories>
 		</profile>
-		<profile>
-			<id>all-dbs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>mysql-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-									<includes>
-										<include>**/MySql*IntegrationTests.java</include>
-									</includes>
-								</configuration>
-							</execution>
-							<execution>
-								<id>postgres-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-									<includes>
-										<include>**/Postgres*IntegrationTests.java</include>
-									</includes>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>eclipselink-next</id>
 			<properties>
@@ -188,85 +151,6 @@
 	</dependencies>
 
 	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-instrument</artifactId>
-						<version>${spring}</version>
-						<scope>runtime</scope>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<!-- override the default-test execution and exclude everything -->
-						<id>default-test</id>
-						<configuration>
-							<excludes>
-								<exclude>**/*</exclude>
-							</excludes>
-						</configuration>
-					</execution>
-					<execution>
-						<id>unit-test</id>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<phase>test</phase>
-						<configuration>
-							<includes>
-								<include>**/*UnitTests.java</include>
-							</includes>
-						</configuration>
-					</execution>
-					<execution>
-						<id>integration-test</id>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<phase>test</phase>
-						<configuration>
-							<includes>
-								<include>**/*IntegrationTests.java</include>
-								<include>**/*Tests.java</include>
-							</includes>
-							<excludes>
-								<exclude>**/*UnitTests.java</exclude>
-								<exclude>**/OpenJpa*</exclude>
-								<exclude>**/EclipseLink*</exclude>
-								<exclude>**/MySql*</exclude>
-								<exclude>**/Postgres*</exclude>
-							</excludes>
-							<argLine>
-								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
-							</argLine>
-						</configuration>
-					</execution>
-					<execution>
-						<id>eclipselink-test</id>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<phase>test</phase>
-						<configuration>
-							<includes>
-								<include>**/EclipseLink*Tests.java</include>
-							</includes>
-							<argLine>
-								-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
-								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
-							</argLine>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-		</plugins>
-
 		<pluginManagement>
 			<plugins>
 				<plugin>
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index c6d9301c0..1e2b5cdd1 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -336,7 +337,8 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<visitor>true</visitor>
-							<sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
+							<sourceDirectory>${project.basedir}/src/main/antlr4
+							</sourceDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -427,4 +429,45 @@
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>all-dbs</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>mysql-test</id>
+								<phase>test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<includes>
+										<include>**/MySql*IntegrationTests.java</include>
+									</includes>
+								</configuration>
+							</execution>
+							<execution>
+								<id>postgres-test</id>
+								<phase>test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<includes>
+										<include>**/Postgres*IntegrationTests.java
+										</include>
+									</includes>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>