diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
index fd5c7f9d3a..336330df70 100644
--- a/ejb-txn-remote-call/client/pom.xml
+++ b/ejb-txn-remote-call/client/pom.xml
@@ -190,16 +190,6 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.plugin.wildfly}</version>
-                    <configuration>
-                        <!-- Env used when calling wildfly:start goal -->
-                        <env>
-                            <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
-                            <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
-                            <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
-                            <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
-                        </env>
-                    </configuration>
-
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -225,10 +215,13 @@
                         <configuration>
                             <filename>client.war</filename>
                             <serverConfig>standalone.xml</serverConfig>
-                            <!--
-                                Note that the pluginManagement section for this plugin contains environment variables
-                                which are needed to connect to the database when doing 'mvn wildfly:start'
-                            -->
+                            <!-- Env used when calling wildfly:start goal -->
+                            <env>
+                                <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
+                                <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
+                                <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
+                                <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
+                            </env>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
index 4cd7b7357e..be794eed82 100644
--- a/ejb-txn-remote-call/server/pom.xml
+++ b/ejb-txn-remote-call/server/pom.xml
@@ -174,15 +174,6 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.plugin.wildfly}</version>
-                    <configuration>
-                        <!-- Env used when calling wildfly:start goal -->
-                        <env>
-                            <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
-                            <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
-                            <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
-                            <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
-                        </env>
-                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -210,10 +201,13 @@
                         <configuration>
                             <filename>server.war</filename>
                             <serverConfig>standalone-ha.xml</serverConfig>
-                            <!--
-                                Note that the pluginManagement section for this plugin contains environment variables
-                                which are needed to connect to the database when doing 'mvn wildfly:start'
-                            -->
+                            <!-- Env used when calling wildfly:start goal -->
+                            <env>
+                                <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
+                                <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
+                                <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
+                                <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
+                            </env>
                         </configuration>
                         <executions>
                             <execution>