diff --git a/jpa/pom.xml b/jpa/pom.xml
new file mode 100644
index 0000000..9aef351
--- /dev/null
+++ b/jpa/pom.xml
@@ -0,0 +1,25 @@
+<?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>org.javaee8</groupId>
+        <artifactId>samples-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>jpa</artifactId>
+    <packaging>pom</packaging>
+    <name>Java EE 8 Samples: JPA</name>
+    
+    <modules>
+        <module>stream</module>
+    </modules>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.javaee8</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/jpa/stream/pom.xml b/jpa/stream/pom.xml
new file mode 100644
index 0000000..910c3cb
--- /dev/null
+++ b/jpa/stream/pom.xml
@@ -0,0 +1,13 @@
+<?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>org.javaee8</groupId>
+        <artifactId>jpa</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>stream</artifactId>
+    <packaging>war</packaging>
+    <name>Java EE 8 Samples: JPA - Stream</name>
+</project>
diff --git a/jpa/stream/src/main/java/org/javaee8/jpa/stream/domain/Person.java b/jpa/stream/src/main/java/org/javaee8/jpa/stream/domain/Person.java
new file mode 100644
index 0000000..e6c1166
--- /dev/null
+++ b/jpa/stream/src/main/java/org/javaee8/jpa/stream/domain/Person.java
@@ -0,0 +1,52 @@
+package org.javaee8.jpa.stream.domain;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * 
+ * @author Gaurav Gupta
+ *
+ */
+@Entity
+public class Person implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Basic
+    private String name;
+
+    @Basic
+    private String address;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return this.address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+}
\ No newline at end of file
diff --git a/jpa/stream/src/main/java/org/javaee8/jpa/stream/repository/PersonRepository.java b/jpa/stream/src/main/java/org/javaee8/jpa/stream/repository/PersonRepository.java
new file mode 100644
index 0000000..4eca1d5
--- /dev/null
+++ b/jpa/stream/src/main/java/org/javaee8/jpa/stream/repository/PersonRepository.java
@@ -0,0 +1,25 @@
+package org.javaee8.jpa.stream.repository;
+
+import java.util.stream.Stream;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaQuery;
+import org.javaee8.jpa.stream.domain.Person;
+
+/**
+ * 
+ * @author Gaurav Gupta
+ *
+ */
+public class PersonRepository {
+
+    @PersistenceContext(unitName = "DEFAULT_PU")
+    private EntityManager em;
+
+    public Stream<Person> findAll() {
+        CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+        cq.select(cq.from(Person.class));
+        return em.createQuery(cq).getResultStream();
+    }
+
+}
diff --git a/jpa/stream/src/test/java/org/javaee8/jpa/stream/controller/PersonControllerTest.java b/jpa/stream/src/test/java/org/javaee8/jpa/stream/controller/PersonControllerTest.java
new file mode 100644
index 0000000..54b0f75
--- /dev/null
+++ b/jpa/stream/src/test/java/org/javaee8/jpa/stream/controller/PersonControllerTest.java
@@ -0,0 +1,43 @@
+package org.javaee8.jpa.stream.controller;
+
+import java.util.stream.Stream;
+import org.javaee8.jpa.stream.repository.PersonRepository;
+import org.javaee8.jpa.stream.domain.Person;
+import javax.inject.Inject;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Test;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import static org.junit.Assert.assertEquals;
+import org.junit.runner.RunWith;
+
+/**
+ * 
+ * @author Gaurav Gupta
+ *
+ */
+@RunWith(Arquillian.class)
+public class PersonControllerTest {
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsWebInfResource("beans.xml")
+                .addAsResource("test-persistence.xml", "META-INF/persistence.xml")
+                .addAsResource("META-INF/sql/insert.sql")
+                .addClass(Person.class)
+                .addClass(PersonRepository.class);
+    }
+
+    @Inject
+    private PersonRepository personRepository;
+
+    @Test
+    public void testStream() throws Exception {
+        Stream<Person> personStream = personRepository.findAll();
+        long personCount = personStream.count();
+        assertEquals(2, personCount);
+    }
+
+}
diff --git a/jpa/stream/src/test/resources/META-INF/sql/insert.sql b/jpa/stream/src/test/resources/META-INF/sql/insert.sql
new file mode 100644
index 0000000..8be18f1
--- /dev/null
+++ b/jpa/stream/src/test/resources/META-INF/sql/insert.sql
@@ -0,0 +1,2 @@
+INSERT INTO person (id, name, address) VALUES (1002, 'Arjan', 'abc')
+INSERT INTO person (id, name, address) VALUES (1001, 'Gaurav', 'xyz')
diff --git a/jpa/stream/src/test/resources/beans.xml b/jpa/stream/src/test/resources/beans.xml
new file mode 100644
index 0000000..2777559
--- /dev/null
+++ b/jpa/stream/src/test/resources/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/jpa/stream/src/test/resources/test-persistence.xml b/jpa/stream/src/test/resources/test-persistence.xml
new file mode 100644
index 0000000..6e1a33c
--- /dev/null
+++ b/jpa/stream/src/test/resources/test-persistence.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+  <persistence-unit name="DEFAULT_PU" transaction-type="JTA">
+    <jta-data-source>java:comp/DefaultDataSource</jta-data-source>
+    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+    <properties>
+      <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+      <property name="javax.persistence.sql-load-script-source" value="META-INF/sql/insert.sql"/>
+    </properties>
+  </persistence-unit>
+</persistence>
diff --git a/pom.xml b/pom.xml
index ef170ec..ed3a2f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
       <module>servlet</module>
       <module>jsf</module>
       <module>cdi</module>
+      <module>jpa</module>
       <module>jsonb</module>
     </modules>
 
@@ -124,6 +125,13 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.2.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>