diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
index d1d245ba6d..772e4056d3 100644
--- a/ejb/ejb-client/pom.xml
+++ b/ejb/ejb-client/pom.xml
@@ -1,28 +1,54 @@
 <?xml version="1.0"?>
 <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/maven-v4_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-client</artifactId>
-	<name>EJB3 Client Maven</name>
-	<description>EJB3 Client Maven</description>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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-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.1</maven-surefire-plugin.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-ejb-client-bom</artifactId>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.baeldung.ejb</groupId>
+            <artifactId>ejb-remote</artifactId>
+            <type>ejb</type>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*EJBSetupTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.wildfly</groupId>
-			<artifactId>wildfly-ejb-client-bom</artifactId>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.baeldung.ejb</groupId>
-			<artifactId>ejb-remote</artifactId>
-			<type>ejb</type>
-		</dependency>
-	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java b/ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
index 5426bbdc81..08286d580e 100644
--- a/ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
+++ b/ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
@@ -55,8 +55,8 @@ public class EJBClient {
         prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
         prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080");
-        prop.put(Context.SECURITY_PRINCIPAL, "pritamtest");
-        prop.put(Context.SECURITY_CREDENTIALS, "iamtheki9g");
+        prop.put(Context.SECURITY_PRINCIPAL, "testUser");
+        prop.put(Context.SECURITY_CREDENTIALS, "admin1234!");
         prop.put("jboss.naming.client.ejb.context", false);
 
         context = new InitialContext(prop);
diff --git a/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties b/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
index e17d8ba17e..077cd7583f 100644
--- a/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
+++ b/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
@@ -4,5 +4,5 @@ remote.connection.default.port=8080
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS=${host.auth:JBOSS-LOCAL-USER}
-remote.connection.default.username=pritamtest
-remote.connection.default.password=iamtheki9g
\ No newline at end of file
+remote.connection.default.username=testUser
+remote.connection.default.password=admin1234!
\ No newline at end of file
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index 3661fa5b2c..65bfc6dbec 100644
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -28,8 +28,8 @@
 				<configuration>
 					<hostname>127.0.0.1</hostname>
 					<port>9990</port>
-					<username>pritamtest</username>
-					<password>iamtheki9g</password>
+					<username>testUser</username>
+					<password>admin1234!</password>
 					<filename>${build.finalName}.jar</filename>
 				</configuration>
 			</plugin>
diff --git a/ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
index 6c5ee34afe..4b88747e6a 100644
--- a/ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
+++ b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
@@ -1,15 +1,10 @@
 package com.baeldung.ejb.tutorial;
 
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
 
 @Stateless(name = "HelloWorld")
 public class HelloWorldBean implements HelloWorld {
 
-    @Resource
-    private SessionContext context;
-
     @Override
     public String getHelloWorld() {
         return "Welcome to EJB Tutorial!";