diff --git a/utils/test/x52_test.c b/utils/test/x52_test.c
index 7816f2a..5aa8aed 100644
--- a/utils/test/x52_test.c
+++ b/utils/test/x52_test.c
@@ -80,7 +80,7 @@ void print_banner(const char *message)
 
 static void signal_handler(int sig)
 {
-    test_exit = sig;
+    test_exit = -sig;
 }
 
 #define TESTS \
@@ -139,12 +139,12 @@ static int run_tests(int test_set)
         #undef X
     } while (0);
 
-    if (rc > 0) {
-        fprintf(stderr, "Received %s signal, quitting...\n", strsignal(rc));
-    } else if (rc < 0) {
-        fprintf(stderr, "Got error %s\n", strerror(-rc));
-    } else {
+    if (rc == LIBX52_SUCCESS) {
         puts("All tests completed successfully");
+    } else if (rc > 0) {
+        fprintf(stderr, "Got error %s\n", libx52_strerror(rc));
+    } else {
+        fprintf(stderr, "Received %s signal, quitting...\n", strsignal(-rc));
     }
 
     if (rc >= 0) test_cleanup();
diff --git a/utils/test/x52_test_common.h b/utils/test/x52_test_common.h
index 4315015..209c808 100644
--- a/utils/test/x52_test_common.h
+++ b/utils/test/x52_test_common.h
@@ -21,13 +21,13 @@ extern bool nodelay;
     int rc; \
     rc = ( libx52_set_ ## tst (dev, __VA_ARGS__) ); \
     if (rc) { \
-        fprintf(stderr, "\n%s(%s) failed with %d\n", #tst, #__VA_ARGS__, rc); \
+        fprintf(stderr, "\n%s(%s) failed with %d(%s)\n", #tst, #__VA_ARGS__, rc, libx52_strerror(rc)); \
         return rc; \
     } \
     if (test_exit) return test_exit; \
     rc  = libx52_update(dev); \
     if (rc) { \
-        fprintf(stderr, "\nupdate failed with %d\n", rc); \
+        fprintf(stderr, "\nupdate failed with %d(%s)\n", rc, libx52_strerror(rc)); \
         return rc; \
     } \
     if (test_exit) return test_exit; \