diff --git a/hadoop-cloud-storage-project/hadoop-tos/pom.xml b/hadoop-cloud-storage-project/hadoop-tos/pom.xml
index 4bbaf74e0f892..cea293dd7869a 100644
--- a/hadoop-cloud-storage-project/hadoop-tos/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-tos/pom.xml
@@ -143,6 +143,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <argLine>${maven-surefire-plugin.argLine}</argLine>
           <parallel>classes</parallel>
           <threadCount>1</threadCount>
           <perCoreThreadCount>true</perCoreThreadCount>
@@ -190,4 +191,52 @@
       </plugin>
     </plugins>
   </build>
+
+    <profiles>
+        <profile>
+            <id>parallel-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.hadoop</groupId>
+                        <artifactId>hadoop-maven-plugins</artifactId>
+                        <executions>
+                            <execution>
+                                <id>parallel-tests-createdir</id>
+                                <goals>
+                                    <goal>parallel-tests-createdir</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <forkCount>${testsThreadCount}</forkCount>
+                            <reuseForks>false</reuseForks>
+                            <argLine>${maven-surefire-plugin.argLine}</argLine>
+                            <systemPropertyVariables>
+                                <testsThreadCount>${testsThreadCount}</testsThreadCount>
+                                <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data>
+                                <test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir>
+                                <hadoop.tmp.dir>${project.build.directory}/test/${surefire.forkNumber}</hadoop.tmp.dir>
+                                <!-- This is intentionally the same directory for all JUnit -->
+                                <!-- forks, for use in the very rare situation that -->
+                                <!-- concurrent tests need to coordinate, such as using lock -->
+                                <!-- files. -->
+                                <test.build.shared.data>${test.build.data}</test.build.shared.data>
+
+                                <!-- Due to a Maven quirk, setting this to just -->
+                                <!-- surefire.forkNumber won't do the parameter substitution. -->
+                                <!-- Putting a prefix in front of it like "fork-" makes it -->
+                                <!-- work. -->
+                                <test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>