diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java
index 531a5dea9e..8b0a51858d 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java
@@ -16,4 +16,19 @@ public class Address {
     @Column(name = "ZIP")
     private String zipCode;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
 }
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
index 0c5c1e9f7e..a91fb3b4c9 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
@@ -15,8 +15,33 @@ public class Email {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
+    private String address;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "employee_id")
     private Employee employee;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Employee getEmployee() {
+        return employee;
+    }
+
+    public void setEmployee(Employee employee) {
+        this.employee = employee;
+    }
 }
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java
index 03becac9f6..3fbdb3820e 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java
@@ -18,4 +18,19 @@ public class Employee {
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "employee")
     private List<Email> emails;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public List<Email> getEmails() {
+        return emails;
+    }
+
+    public void setEmails(List<Email> emails) {
+        this.emails = emails;
+    }
 }
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
index 1eb79cb3e6..e5b9dc06bc 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
@@ -22,4 +22,20 @@ public class Office {
             @JoinColumn(name="ADDR_ZIP", referencedColumnName="ZIP")
     })
     private Address address;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
 }
\ No newline at end of file
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest b/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest
new file mode 100644
index 0000000000..8246a2b01e
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest
@@ -0,0 +1,57 @@
+package com.baeldung.hibernate.joincolumn;
+
+import com.baeldung.hibernate.HibernateUtil;
+import java.io.IOException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class JoinColumnIntegrationTest {
+
+    private Session session;
+    private Transaction transaction;
+
+    @Before
+    public void setUp() throws IOException {
+        session = HibernateUtil.getSessionFactory("hibernate-spatial.properties")
+                .openSession();
+        transaction = session.beginTransaction();
+    }
+
+    @After
+    public void tearDown() {
+        transaction.rollback();
+        session.close();
+    }
+
+    @Test
+    public void givenOfficeEntity_setAddress_shouldPersist() {
+        Office office = new Office();
+
+        Address address = new Address();
+        address.setZipCode("11-111");
+        office.setAddress(address);
+
+        session.save(office);
+        session.flush();
+        session.clear();
+    }
+
+    @Test
+    public void givenEmployeeEntity_setEmails_shouldPersist() {
+        Employee employee = new Employee();
+
+        Email email = new Email();
+        email.setAddress("example@email.com");
+        email.setEmployee(employee);
+
+        session.save(employee);
+        session.flush();
+        session.clear();
+    }
+
+}
\ No newline at end of file