diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7da085c4f650a80ec86b9c0d6389d65f20602703..750bd6fe68034d4cc901fdae000237be70b2a8b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ test:
 
 cleanup:
   stage: cleanup
+  when: always
   tags:
     - private
   script:
diff --git a/src/test/java/com/s3ai/TestUtils.java b/src/test/java/com/s3ai/TestUtils.java
index 4ddd80f0435b580b0def65db3176de11ccf1076e..e7c6e44290a014fae0cbb726453a8293649556e7 100644
--- a/src/test/java/com/s3ai/TestUtils.java
+++ b/src/test/java/com/s3ai/TestUtils.java
@@ -21,31 +21,30 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TestUtils {
 
-    public static void prepareTable(String insertsFile, String table, Boolean cascade) throws IOException {
+    public static void prepareTable(String insertsFile, String table) throws IOException {
         var resourceStream = TestUtils.class.getResourceAsStream(insertsFile);
         assertNotNull(resourceStream);
         var insertQueries = IOUtils.toString(resourceStream, StandardCharsets.UTF_8);
-        var cascade_str = cascade ? " CASCADE;" : ";";
         Session session = HibernateSessionFactory.getSessionFactory().openSession();
         Transaction transaction = session.beginTransaction();
-        session.createSQLQuery("TRUNCATE TABLE " + table + cascade_str).executeUpdate();
+        session.createSQLQuery("TRUNCATE TABLE " + table + " CASCADE;").executeUpdate();
         session.createSQLQuery(insertQueries).executeUpdate();
         transaction.commit();
         session.close();
     }
 
     public static void prepareCinemas() throws IOException {
-        prepareTable("/cinemasFill.sql", "cinema", true);
+        prepareTable("/cinemasFill.sql", "cinema");
     }
 
     public static void prepareUsers() throws IOException {
-        prepareTable("/usersFill.sql", "cinema_user", true);
+        prepareTable("/usersFill.sql", "cinema_user");
     }
 
     public static void prepareTickets() throws IOException {
         prepareCinemas();
         prepareUsers();
-        prepareTable("/ticketsFill.sql", "ticket", false);
+        prepareTable("/ticketsFill.sql", "ticket");
     }
 
     public static <T> T getRandomElement(List<T> elements) {