diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
index 772e4056d3..6ece63572d 100755
--- a/ejb/ejb-client/pom.xml
+++ b/ejb/ejb-client/pom.xml
@@ -1,20 +1,15 @@
 <?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>
-    <properties>
-        <junit.version>4.12</junit.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-    </properties>
-
+	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>
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
@@ -49,6 +44,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>
\ No newline at end of file
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 077cd7583f..a01a675e44 100755
--- a/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
+++ b/ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
@@ -5,4 +5,4 @@ remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMO
 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=testUser
-remote.connection.default.password=admin1234!
\ No newline at end of file
+remote.connection.default.password=admin1234!
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index 65bfc6dbec..d102edd8e3 100755
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -12,11 +12,12 @@
 
 	<!-- <name>ejb-remote</name> -->
 	<dependencies>
-		<dependency>
-			<groupId>org.jboss.spec.javax.ejb</groupId>
-			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
+		 <dependency>
+        <groupId>javax</groupId>
+        <artifactId>javaee-api</artifactId>
+        <version>7.0</version>
+        <scope>provided</scope>
+    </dependency>
 	</dependencies>
 
 	<build>
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 4b88747e6a..f34153d83a 100755
--- 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,13 +1,19 @@
 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!";
     }
 
+    
 }
diff --git a/ejb/pom.xml b/ejb/pom.xml
index 5c54cdcf72..8176de7936 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -36,11 +36,10 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.jboss.spec</groupId>
-				<artifactId>jboss-javaee-7.0</artifactId>
-				<version>1.0.1.Final</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<groupId>javax</groupId>
+				<artifactId>javaee-api</artifactId>
+				<version>7.0</version>
+				<scope>provided</scope>
 			</dependency>
 
 			<dependency>