diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index eadfb5e512..e368bcacba 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -133,18 +133,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
-            <!-- this surefire configuration allows concurrent execution; 
-                do not remove -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                </configuration>
-            </plugin>
+            </plugin>            
         </plugins>
     </build>
 
diff --git a/testing-modules/spring-testing-2/pom.xml b/testing-modules/spring-testing-2/pom.xml
index 807b84c676..4686a20202 100644
--- a/testing-modules/spring-testing-2/pom.xml
+++ b/testing-modules/spring-testing-2/pom.xml
@@ -54,8 +54,25 @@
         </dependency>
         <!-- Test containers only dependencies -->
     </dependencies>
+    
+    <build>
+        <plugins>
+        <!-- this surefire configuration allows concurrent execution; 
+                do not remove -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <parallel>methods</parallel>
+                    <useUnlimitedThreads>true</useUnlimitedThreads>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <properties>
         <testcontainers.version>1.12.2</testcontainers.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/spring-5/src/test/java/com/baeldung/Spring5JUnit4ConcurrentIntegrationTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/concurrent/Spring5JUnit4ConcurrentIntegrationTest.java
similarity index 98%
rename from spring-5/src/test/java/com/baeldung/Spring5JUnit4ConcurrentIntegrationTest.java
rename to testing-modules/spring-testing-2/src/test/java/com/baeldung/concurrent/Spring5JUnit4ConcurrentIntegrationTest.java
index 7e494465b2..8a0947ba44 100644
--- a/spring-5/src/test/java/com/baeldung/Spring5JUnit4ConcurrentIntegrationTest.java
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/concurrent/Spring5JUnit4ConcurrentIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.concurrent;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/EnabledOnJava8.java
similarity index 93%
rename from spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
rename to testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/EnabledOnJava8.java
index c6d3b7ff10..01bdc176e0 100644
--- a/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/EnabledOnJava8.java
@@ -1,4 +1,4 @@
-package com.baeldung.jupiter;
+package com.baeldung.enabledif;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationIntegrationTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/Spring5EnabledAnnotationIntegrationTest.java
similarity index 97%
rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationIntegrationTest.java
rename to testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/Spring5EnabledAnnotationIntegrationTest.java
index 35363e0ea3..b6ccb2204b 100644
--- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationIntegrationTest.java
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/enabledif/Spring5EnabledAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.jupiter;
+package com.baeldung.enabledif;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;