diff --git a/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql b/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql
new file mode 100644
index 00000000..5c46e014
--- /dev/null
+++ b/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql
@@ -0,0 +1,21 @@
+--liquibase formatted sql
+
+-- ============================================================================
+--changeset michael.hoennig:hs-global-cleanup endDelimiter:--//
+-- ----------------------------------------------------------------------------
+
+DROP PROCEDURE IF EXISTS hs_office.bankaccount_create_test_data(IN givenholder character varying, IN giveniban character varying, IN givenbic character varying);
+DROP PROCEDURE IF EXISTS hs_office.contact_create_test_data(IN contcaption character varying);
+DROP PROCEDURE IF EXISTS hs_office.contact_create_test_data(IN startcount integer, IN endcount integer);
+DROP PROCEDURE IF EXISTS hs_office.coopassettx_create_test_data(IN givenpartnernumber numeric, IN givenmembernumbersuffix character);
+DROP PROCEDURE IF EXISTS hs_office.coopsharetx_create_test_data(IN givenpartnernumber numeric, IN givenmembernumbersuffix character);
+DROP PROCEDURE IF EXISTS hs_office.debitor_create_test_data(IN withdebitornumbersuffix numeric, IN forpartnerpersonname character varying, IN forbillingcontactcaption character varying, IN withdefaultprefix character varying);
+DROP PROCEDURE IF EXISTS hs_office.membership_create_test_data(IN forpartnernumber numeric, IN newmembernumbersuffix character);
+DROP PROCEDURE IF EXISTS hs_office.partner_create_test_data(IN mandanttradename character varying, IN newpartnernumber numeric, IN partnerpersonname character varying, IN contactcaption character varying);
+DROP PROCEDURE IF EXISTS hs_office.person_create_test_data(IN newpersontype hs_office.persontype, IN newtradename character varying, IN newfamilyname character varying, IN newgivenname character varying);
+DROP PROCEDURE IF EXISTS hs_office.relation_create_test_data(IN startcount integer, IN endcount integer);
+DROP PROCEDURE IF EXISTS hs_office.relation_create_test_data(IN holderpersonname character varying, IN relationtype hs_office.relationtype, IN anchorpersonname character varying, IN contactcaption character varying, IN mark character varying);
+DROP PROCEDURE IF EXISTS hs_office.sepamandate_create_test_data(IN forpartnernumber numeric, IN fordebitorsuffix character, IN foriban character varying, IN withreference character varying);
+
+DROP SCHEMA IF EXISTS rbactest CASCADE;
+--//
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 4cbc8cf4..74a6005e 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -212,6 +212,10 @@ databaseChangeLog:
         file: db/changelog/9-hs-global/9000-statistics.sql
         context: "!only-office"
 
+    - include:
+          file: db/changelog/9-hs-global/9800-cleanup.sql
+          context: "without-test-data"
+
     - include:
         file: db/changelog/9-hs-global/9100-hs-integration-schema.sql
     - include: