diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
index 6ece63572d..ba5763a3e7 100755
--- a/ejb/ejb-client/pom.xml
+++ b/ejb/ejb-client/pom.xml
@@ -10,6 +10,12 @@
 	<artifactId>ejb-client</artifactId>
 	<name>EJB3 Client Maven</name>
 	<description>EJB3 Client Maven</description>
+
+    <properties>
+        <junit.version>4.12</junit.version>
+        <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
diff --git a/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java b/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java
index 1a8165cee6..fa92873a73 100755
--- a/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java
+++ b/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java
@@ -1,16 +1,18 @@
 package com.baeldung.ejb.setup.test;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
 import com.baeldung.ejb.client.EJBClient;
 import com.baeldung.ejb.tutorial.HelloWorldBean;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 public class EJBSetupTest {
 
     @Test
-    public void testEJBClient() {
+    public void EJBClientTest() {
         EJBClient ejbClient = new EJBClient();
         HelloWorldBean bean = new HelloWorldBean();
         assertEquals(bean.getHelloWorld(), ejbClient.getEJBRemoteMessage());
     }
+
 }
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index d102edd8e3..beb182ff8b 100755
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -1,40 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.baeldung.ejb</groupId>
-		<artifactId>ejb</artifactId>
-		<version>1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>ejb-remote</artifactId>
-	<packaging>ejb</packaging>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.baeldung.ejb</groupId>
+        <artifactId>ejb</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ejb-remote</artifactId>
+    <packaging>ejb</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>${javaee-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+
+    <profiles>
+        <!-- mvn clean package cargo:run -->
+        <profile>
+            <id>wildfly-standalone</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>${cargo-maven2-plugin.version}</version>
+
+                        <configuration>
+
+                            <container>
+                                <containerId>wildfly10x</containerId>
+                                <zipUrlInstaller>
+                                    <url>http://download.jboss.org/wildfly/10.1.0.Final/wildfly-10.1.0.Final.zip</url>
+                                </zipUrlInstaller>
+                            </container>
+
+                            <configuration>
+                                <properties>
+                                    <cargo.hostname>127.0.0.1</cargo.hostname>
+                                    <cargo.jboss.management-http.port>9990</cargo.jboss.management-http.port>
+                                    <cargo.servlet.users>testUser:admin1234!</cargo.servlet.users>
+                                </properties>
+                            </configuration>
+
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--mvn clean install wildfly:deploy -Pwildfly-runtime-->
+        <profile>
+            <id>wildfly-runtime</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <version>1.1.0.Alpha5</version>
+                        <configuration>
+                            <hostname>127.0.0.1</hostname>
+                            <port>9990</port>
+                            <username>testUser</username>
+                            <password>admin1234!</password>
+                            <filename>${build.finalName}.jar</filename>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+    <properties>
+        <javaee-api.version>7.0</javaee-api.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+    </properties>
+
+</project>
 
-	<!-- <name>ejb-remote</name> -->
-	<dependencies>
-		 <dependency>
-        <groupId>javax</groupId>
-        <artifactId>javaee-api</artifactId>
-        <version>7.0</version>
-        <scope>provided</scope>
-    </dependency>
-	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.wildfly.plugins</groupId>
-				<artifactId>wildfly-maven-plugin</artifactId>
-				<version>1.1.0.Alpha5</version>
-				<configuration>
-					<hostname>127.0.0.1</hostname>
-					<port>9990</port>
-					<username>testUser</username>
-					<password>admin1234!</password>
-					<filename>${build.finalName}.jar</filename>
-				</configuration>
-			</plugin>
-		</plugins>
-		<!-- <finalName>ejb-remote</finalName> -->
-	</build>
-</project>
\ No newline at end of file
diff --git a/ejb/pom.xml b/ejb/pom.xml
index 8176de7936..b00f80a817 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.baeldung.ejb</groupId>
-	<artifactId>ejb</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ejb</name>
-	<description>EJB Tutorial</description>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.ejb</groupId>
+    <artifactId>ejb</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>ejb</name>
+    <description>EJB Tutorial</description>
 
-	<repositories>
-		<repository>
-			<id>jboss-public-repository-group</id>
-			<name>JBoss Public Maven Repository Group</name>
-			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
-			<layout>default</layout>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>jboss-public-repository-group</id>
+            <name>JBoss Public Maven Repository Group</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+            <layout>default</layout>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.baeldung.ejb</groupId>
-				<artifactId>ejb-remote</artifactId>
-				<version>1.0-SNAPSHOT</version>
-				<type>ejb</type>
-			</dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.baeldung.ejb</groupId>
+                <artifactId>ejb-remote</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>ejb</type>
+            </dependency>
 
-			<dependency>
-				<groupId>javax</groupId>
-				<artifactId>javaee-api</artifactId>
-				<version>7.0</version>
-				<scope>provided</scope>
-			</dependency>
+            <dependency>
+                <groupId>javax</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>7.0</version>
+                <scope>provided</scope>
+            </dependency>
 
-			<dependency>
-				<groupId>org.wildfly</groupId>
-				<artifactId>wildfly-ejb-client-bom</artifactId>
-				<version>10.1.0.Final</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+            <dependency>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>10.1.0.Final</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.1</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
 
-				<plugin>
-					<artifactId>maven-ejb-plugin</artifactId>
-					<version>2.4</version>
-					<configuration>
-						<ejbVersion>3.2</ejbVersion>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+                <plugin>
+                    <artifactId>maven-ejb-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <ejbVersion>3.2</ejbVersion>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 	<modules>
 		<module>ejb-remote</module>