diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java
index 875b56df34..5a87028960 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java
@@ -16,7 +16,7 @@ public class Parent implements Serializable {
     @GeneratedValue
     private long id;
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH, CascadeType.DETACH })
     @JoinColumn(name = "child_fk")
     private Child child;
 
diff --git a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
index 27338a6c4d..753d94ac79 100644
--- a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
+++ b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
@@ -7,6 +7,7 @@ import org.hibernate.SessionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
@@ -46,8 +47,8 @@ public class ParentServicePersistenceIntegrationTest {
         System.out.println("Parent - child = " + service.findOne(parentEntity.getId()).getChild());
     }
 
-    @Test
-    public final void whenChildIsDeleted_thenDataException() {
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenChildIsDeletedWhileParentStillHasForeignKeyToIt_thenDataException() {
         final Child childEntity = new Child();
         childService.create(childEntity);
 
@@ -57,4 +58,16 @@ public class ParentServicePersistenceIntegrationTest {
         childService.delete(childEntity);
     }
 
+    @Test
+    public final void whenChildIsDeletedAfterTheParent_thenNoExceptions() {
+        final Child childEntity = new Child();
+        childService.create(childEntity);
+
+        final Parent parentEntity = new Parent(childEntity);
+        service.create(parentEntity);
+
+        service.delete(parentEntity);
+        childService.delete(childEntity);
+    }
+
 }