diff --git a/src/util-memcmp.c b/src/util-memcmp.c
index bf3d8e56b3..7113b82dd6 100644
--- a/src/util-memcmp.c
+++ b/src/util-memcmp.c
@@ -38,10 +38,8 @@ static int MemcmpTest01 (void)
     uint8_t a[] = "abcd";
     uint8_t b[] = "abcd";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest02 (void)
@@ -49,10 +47,8 @@ static int MemcmpTest02 (void)
     uint8_t a[] = "abcdabcdabcdabcd";
     uint8_t b[] = "abcdabcdabcdabcd";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest03 (void)
@@ -60,10 +56,8 @@ static int MemcmpTest03 (void)
     uint8_t a[] = "abcdabcd";
     uint8_t b[] = "abcdabcd";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest04 (void)
@@ -72,12 +66,9 @@ static int MemcmpTest04 (void)
     uint8_t b[] = "abcD";
 
     int r = SCMemcmp(a, b, sizeof(a)-1);
-    if (r != 1) {
-        printf("%s != %s, but memcmp returned %d: ", a, b, r);
-        return 0;
-    }
+    FAIL_IF(r != 1);
 
-    return 1;
+    PASS;
 }
 
 static int MemcmpTest05 (void)
@@ -85,10 +76,8 @@ static int MemcmpTest05 (void)
     uint8_t a[] = "abcdabcdabcdabcd";
     uint8_t b[] = "abcDabcdabcdabcd";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 1)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 1);
+    PASS;
 }
 
 static int MemcmpTest06 (void)
@@ -96,10 +85,8 @@ static int MemcmpTest06 (void)
     uint8_t a[] = "abcdabcd";
     uint8_t b[] = "abcDabcd";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 1)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 1);
+    PASS;
 }
 
 static int MemcmpTest07 (void)
@@ -107,10 +94,8 @@ static int MemcmpTest07 (void)
     uint8_t a[] = "abcd";
     uint8_t b[] = "abcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest08 (void)
@@ -118,10 +103,8 @@ static int MemcmpTest08 (void)
     uint8_t a[] = "abcdabcdabcdabcd";
     uint8_t b[] = "abcdabcdabcdabcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest09 (void)
@@ -129,10 +112,8 @@ static int MemcmpTest09 (void)
     uint8_t a[] = "abcdabcd";
     uint8_t b[] = "abcdabcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 static int MemcmpTest10 (void)
@@ -140,10 +121,8 @@ static int MemcmpTest10 (void)
     uint8_t a[] = "abcd";
     uint8_t b[] = "Zbcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 1)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 1);
+    PASS;
 }
 
 static int MemcmpTest11 (void)
@@ -151,10 +130,8 @@ static int MemcmpTest11 (void)
     uint8_t a[] = "abcdabcdabcdabcd";
     uint8_t b[] = "Zbcdabcdabcdabcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 1)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 1);
+    PASS;
 }
 
 static int MemcmpTest12 (void)
@@ -162,10 +139,8 @@ static int MemcmpTest12 (void)
     uint8_t a[] = "abcdabcd";
     uint8_t b[] = "Zbcdabcde";
 
-    if (SCMemcmp(a, b, sizeof(a)-1) != 1)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmp(a, b, sizeof(a) - 1) != 1);
+    PASS;
 }
 
 static int MemcmpTest13 (void)
@@ -173,10 +148,8 @@ static int MemcmpTest13 (void)
     uint8_t a[] = "abcdefgh";
     uint8_t b[] = "AbCdEfGhIjK";
 
-    if (SCMemcmpLowercase(a, b, sizeof(a)-1) != 0)
-        return 0;
-
-    return 1;
+    FAIL_IF(SCMemcmpLowercase(a, b, sizeof(a) - 1) != 0);
+    PASS;
 }
 
 #include "util-cpu.h"
@@ -216,10 +189,9 @@ static int MemcmpTest14 (void)
     SCLogInfo("ticks passed %"PRIu64, ticks_end - ticks_start);
 
     printf("r1 %d\n", r1);
-    if (r1 != (51 * TEST_RUNS))
-        return 0;
+    FAIL_IF(r1 != (51 * TEST_RUNS));
 #endif
-    return 1;
+    PASS;
 }
 
 static int MemcmpTest15 (void)
@@ -255,10 +227,9 @@ static int MemcmpTest15 (void)
     SCLogInfo("ticks passed %"PRIu64, ticks_end - ticks_start);
 
     printf("r2 %d\n", r2);
-    if (r2 != (51 * TEST_RUNS))
-        return 0;
+    FAIL_IF(r2 != (51 * TEST_RUNS));
 #endif
-    return 1;
+    PASS;
 }
 
 static int MemcmpTest16 (void)
@@ -294,10 +265,9 @@ static int MemcmpTest16 (void)
     SCLogInfo("ticks passed %"PRIu64, ticks_end - ticks_start);
 
     printf("r3 %d\n", r3);
-    if (r3 != (51 * TEST_RUNS))
-        return 0;
+    FAIL_IF(r3 != (51 * TEST_RUNS));
 #endif
-    return 1;
+    PASS;
 }
 
 static int MemcmpTest17 (void)
@@ -333,10 +303,9 @@ static int MemcmpTest17 (void)
     SCLogInfo("ticks passed %"PRIu64, ticks_end - ticks_start);
 
     printf("r4 %d\n", r4);
-    if (r4 != (51 * TEST_RUNS))
-        return 0;
+    FAIL_IF(r4 != (51 * TEST_RUNS));
 #endif
-    return 1;
+    PASS;
 }
 
 struct MemcmpTest18Tests {
@@ -370,12 +339,11 @@ static int MemcmpTest18 (void)
 
     while (t && t->a != NULL) {
 
-        if (SCMemcmpLowercase(t->a, t->b, strlen(t->a)-1) != t->result)
-            return 0;
+        FAIL_IF(SCMemcmpLowercase(t->a, t->b, strlen(t->a) - 1) != t->result);
         t++;
     }
 
-    return 1;
+    PASS;
 }
 
 #endif /* UNITTESTS */