diff --git a/build-common.xml b/build-common.xml
index 28793014633398..7fa23bf9fa18a3 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -829,7 +829,7 @@ Please set the environment variable ANT_OPTS to the recommended value of
 		</if>
 
 		<ant target="test-cmd">
-			<property name="junit.forkmode" value="once" />
+			<property name="junit.forkmode" value="perTest" />
 			<property name="test.type" value="${test.type}" />
 		</ant>