diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
index ee156e273974de..fce7859f7272e1 100644
--- a/core/deployment/pom.xml
+++ b/core/deployment/pom.xml
@@ -136,13 +136,10 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemProperties>
-                        <property>
-                            <!-- Give tests a hint to not use containers, by default -->
-                            <name>avoid-containers</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <!-- Give tests a hint to not use containers, by default -->
+                        <avoid-containers>true</avoid-containers>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -205,13 +202,10 @@
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <systemProperties>
-                                <property>
-                                    <!-- Enable the container-based tests -->
-                                    <name>avoid-containers</name>
-                                    <value>false</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <!-- Enable the container-based tests -->
+                                <avoid-containers>false</avoid-containers>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
                 </plugins>