diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
index cd02ea040..a769c121a 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
@@ -266,6 +266,7 @@ public class ContentItemManager {
      * target folder is the same folder as the folder of the original item an
      * index is appended to the name of the item.
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings("unchecked")
     public void copy(final ContentItem item, final Category targetFolder) {
         if (item == null) {
diff --git a/ccm-cms/src/test/resources/scripts/h2-cleanup.sql b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
index f6e3e09db..8c1fdfd1f 100644
--- a/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
+++ b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
@@ -4,14 +4,24 @@ DELETE FROM ccm_cms.news;
 
 DELETE FROM ccm_cms.article_texts;
 
+DELETE FROM ccm_cms.article_texts_aud;
+
 DELETE FROM ccm_cms.articles;
 
+DELETE FROM ccm_cms.articles_aud;
+
 DELETE FROM ccm_cms.content_item_names;
 
+DELETE FROM ccm_cms.content_item_names_aud;
+
 DELETE FROM ccm_cms.content_item_titles;
 
+DELETE FROM ccm_cms.content_item_titles_aud;
+
 DELETE FROM ccm_cms.content_items;
 
+DELETE FROM ccm_cms.content_items_aud;
+
 DELETE FROM ccm_cms.content_section_lifecycle_definitions;
 
 DELETE FROM ccm_cms.content_type_labels;
@@ -110,5 +120,9 @@ DELETE FROM ccm_core.parties;
 
 DELETE FROM ccm_core.ccm_roles;
 
+DELETE FROM ccm_core.ccm_objects_aud;
+
+DELETE FROM ccm_core.ccm_revisions;
+
 ALTER SEQUENCE hibernate_sequence RESTART WITH 1;
 
diff --git a/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql b/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql
index b303efbe8..7e214d17b 100644
--- a/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql
+++ b/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql
@@ -4,14 +4,22 @@ DELETE FROM ccm_cms.news;
 
 DELETE FROM ccm_cms.article_texts;
 
+DELETE FROM ccm_cms.article_texts_aud;
+
 DELETE FROM ccm_cms.articles;
 
 DELETE FROM ccm_cms.content_item_names;
 
+DELETE FROM ccm_cms.content_item_names_aud;
+
 DELETE FROM ccm_cms.content_item_titles;
 
+DELETE FROM ccm_cms.content_item_titles_aud;
+
 DELETE FROM ccm_cms.content_items;
 
+DELETE FROM ccm_cms.content_items_aud;
+
 DELETE FROM ccm_cms.content_section_lifecycle_definitions;
 
 DELETE FROM ccm_cms.content_section_workflow_templates;
@@ -78,5 +86,9 @@ DELETE FROM ccm_core.parties;
 
 DELETE FROM ccm_core.ccm_roles;
 
+DELETE FROM ccm_core.ccm_objects_aud;
+
+DELETE FROM ccm_core.ccm_revisions;
+
 ALTER SEQUENCE hibernate_sequence RESTART;