diff --git a/pom.xml b/pom.xml
index 1389c2522..5be5db7b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,9 @@
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>
+					<excludes>
+						<exclude>**/infrastructure/*.java</exclude>
+					</excludes>
 					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa}/openjpa-${openjpa}.jar</argLine>
 				</configuration>
 				<dependencies>
@@ -307,20 +310,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/infrastructure/*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>