diff --git a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/findall/FindAll.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/findall/FindAll.java
new file mode 100644
index 0000000000..cc0c234df0
--- /dev/null
+++ b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/findall/FindAll.java
@@ -0,0 +1,35 @@
+package com.baeldung.hibernate.findall;
+
+import java.util.List;
+
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.hibernate.Session;
+
+import com.baeldung.hibernate.pojo.Student;
+
+public class FindAll {
+
+    private Session session;
+
+    public FindAll(Session session) {
+        super();
+        this.session = session;
+    }
+
+    public List<Student> findAllWithJpql() {
+        return session.createQuery("SELECT a FROM Student a", Student.class).getResultList();
+    }
+
+    public List<Student> findAllWithCriteriaQuery() {
+        CriteriaBuilder cb = session.getCriteriaBuilder();
+        CriteriaQuery<Student> cq = cb.createQuery(Student.class);
+        Root<Student> rootEntry = cq.from(Student.class);
+        CriteriaQuery<Student> all = cq.select(rootEntry);
+        TypedQuery<Student> allQuery = session.createQuery(all);
+        return allQuery.getResultList();
+    }
+}
diff --git a/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/findall/FindAllUnitTest.java b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/findall/FindAllUnitTest.java
new file mode 100644
index 0000000000..8a1b9e9791
--- /dev/null
+++ b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/findall/FindAllUnitTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.hibernate.findall;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.baeldung.hibernate.HibernateUtil;
+import com.baeldung.hibernate.pojo.Student;
+
+public class FindAllUnitTest {
+
+    private Session session;
+    private Transaction transaction;
+    
+    private FindAll findAll;
+
+    @Before
+    public void setUp() throws IOException {
+
+        session = HibernateUtil.getSessionFactory().openSession();
+        transaction = session.beginTransaction();
+        findAll = new FindAll(session);
+
+        session.createNativeQuery("delete from Student").executeUpdate();
+
+        Student student1 = new Student();
+        session.persist(student1);
+
+        Student student2 = new Student();
+        session.persist(student2);
+
+        Student student3 = new Student();
+        session.persist(student3);
+
+        transaction.commit();
+        transaction = session.beginTransaction();
+    }
+
+    @After
+    public void tearDown() {
+        transaction.rollback();
+        session.close();
+    }
+
+    @Test
+    public void givenCriteriaQuery_WhenFindAll_ThenGetAllPersons() {
+        List<Student> list = findAll.findAllWithCriteriaQuery();
+        assertEquals(3, list.size());
+    }
+    
+    @Test
+    public void givenJpql_WhenFindAll_ThenGetAllPersons() {
+        List<Student> list = findAll.findAllWithJpql();
+        assertEquals(3, list.size());
+    }
+}