diff -r e86049631677 -r 87638f19f6dd test/utils.c
--- a/test/utils.c	Wed Dec 31 16:41:16 2025 +0100
+++ b/test/utils.c	Wed Jan 07 22:23:43 2026 +0100
@@ -26,33 +26,31 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "test.h"
+#include <cx/test.h>
 
 #include <libidav/utils.h>
 
-UCX_TEST(test_util_parse_creationdate) {
-    UCX_TEST_BEGIN;
-    
-    time_t t1 = util_parse_creationdate("2012-11-29T21:35:36Z");
-    time_t t2 = util_parse_creationdate("2023-09-17T13:03:00+02:00");
+CX_TEST(test_util_parse_creationdate) {
+    CX_TEST_DO {
     
-    struct tm *tm = gmtime(&t1);
-    UCX_TEST_ASSERT(tm->tm_year == 112, "t1: wrong year");
-    UCX_TEST_ASSERT(tm->tm_mon == 10, "t1: wrong month");
-    UCX_TEST_ASSERT(tm->tm_mday == 29, "t1: wrong day");
-    UCX_TEST_ASSERT(tm->tm_hour == 21, "t1: wrong hour");
-    UCX_TEST_ASSERT(tm->tm_min == 35, "t1: wrong minute");
-    UCX_TEST_ASSERT(tm->tm_sec == 36, "t1: wrong second");
-    
-    tm = gmtime(&t2);
-    UCX_TEST_ASSERT(tm->tm_year == 123, "t2: wrong year");
-    UCX_TEST_ASSERT(tm->tm_mon == 8, "t2: wrong month");
-    UCX_TEST_ASSERT(tm->tm_mday == 17, "t2: wrong day");
-    UCX_TEST_ASSERT(tm->tm_hour == 11, "t2: wrong hour");
-    UCX_TEST_ASSERT(tm->tm_min == 03, "t2: wrong minute");
-    UCX_TEST_ASSERT(tm->tm_sec == 0, "t2: wrong second");
-    
-    UCX_TEST_END;
-    
-    
+        time_t t1 = util_parse_creationdate("2012-11-29T21:35:36Z");
+        time_t t2 = util_parse_creationdate("2023-09-17T13:03:00+02:00");
+
+        struct tm *tm = gmtime(&t1);
+        CX_TEST_ASSERTMM(tm->tm_year == 112, "t1: wrong year");
+        CX_TEST_ASSERTMM(tm->tm_mon == 10, "t1: wrong month");
+        CX_TEST_ASSERTMM(tm->tm_mday == 29, "t1: wrong day");
+        CX_TEST_ASSERTMM(tm->tm_hour == 21, "t1: wrong hour");
+        CX_TEST_ASSERTMM(tm->tm_min == 35, "t1: wrong minute");
+        CX_TEST_ASSERTMM(tm->tm_sec == 36, "t1: wrong second");
+
+        tm = gmtime(&t2);
+        CX_TEST_ASSERTMM(tm->tm_year == 123, "t2: wrong year");
+        CX_TEST_ASSERTMM(tm->tm_mon == 8, "t2: wrong month");
+        CX_TEST_ASSERTMM(tm->tm_mday == 17, "t2: wrong day");
+        CX_TEST_ASSERTMM(tm->tm_hour == 11, "t2: wrong hour");
+        CX_TEST_ASSERTMM(tm->tm_min == 03, "t2: wrong minute");
+        CX_TEST_ASSERTMM(tm->tm_sec == 0, "t2: wrong second");
+
+    }
 }