diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/builder/RelationshipTypeBuilder.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/builder/RelationshipTypeBuilder.java
index c03deeb7bc..995b88488c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/builder/RelationshipTypeBuilder.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/builder/RelationshipTypeBuilder.java
@@ -37,12 +37,15 @@ public class RelationshipTypeBuilder extends AbstractBuilder<RelationshipType, R
 
     @Override
     public void cleanup() throws Exception {
-        context.turnOffAuthorisationSystem();
-        List<Relationship> byRelationshipType = relationshipService.findByRelationshipType(context, relationshipType);
-        for (Relationship relationship : byRelationshipType) {
-            relationshipService.delete(context, relationship);
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            List<Relationship> byRelationshipType = relationshipService
+                .findByRelationshipType(c, relationshipType);
+            for (Relationship relationship : byRelationshipType) {
+                relationshipService.delete(c, relationship);
+            }
+            c.complete();
         }
-        context.restoreAuthSystemState();
 
         delete(relationshipType);
     }