diff --git a/src/detect-classtype.c b/src/detect-classtype.c
index bec179e72b..1ff4654fff 100644
--- a/src/detect-classtype.c
+++ b/src/detect-classtype.c
@@ -211,6 +211,7 @@ static int DetectClasstypeTest01(void)
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
     FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     FAIL_IF_NULL(fd);
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
@@ -220,6 +221,7 @@ static int DetectClasstypeTest01(void)
     FAIL_IF_NULL(s);
     FAIL_IF_NOT(s->prio == 3);
 
+    SCClassConfDeInitContext(de_ctx);
     DetectEngineCtxFree(de_ctx);
     PASS;
 }
@@ -234,6 +236,7 @@ static int DetectClasstypeTest02(void)
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
     FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     FAIL_IF_NULL(fd);
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
@@ -265,6 +268,7 @@ static int DetectClasstypeTest02(void)
     FAIL_IF_NULL(sig);
     FAIL_IF_NOT(sig->prio == 2);
 
+    SCClassConfDeInitContext(de_ctx);
     DetectEngineCtxFree(de_ctx);
     PASS;
 }
@@ -278,6 +282,7 @@ static int DetectClasstypeTest03(void)
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
     FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     FAIL_IF_NULL(fd);
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
@@ -303,6 +308,7 @@ static int DetectClasstypeTest03(void)
     FAIL_IF_NULL(sig);
     FAIL_IF_NOT(sig->prio == 5);
 
+    SCClassConfDeInitContext(de_ctx);
     DetectEngineCtxFree(de_ctx);
     PASS;
 }
diff --git a/src/detect-parse.c b/src/detect-parse.c
index 5023135830..1f4a147929 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -3661,6 +3661,7 @@ static int SigParseTest02 (void)
     if (de_ctx == NULL)
         goto end;
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
 
diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 63506a62ce..a7dedd3467 100644
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -655,6 +655,7 @@ static int SCClassConfTest01(void)
     if (de_ctx == NULL)
         return result;
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
 
@@ -681,6 +682,7 @@ static int SCClassConfTest02(void)
     if (de_ctx == NULL)
         return result;
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateInvalidDummyClassConfigFD03();
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
 
@@ -704,6 +706,7 @@ static int SCClassConfTest03(void)
 
     FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateInvalidDummyClassConfigFD02();
     FAIL_IF(SCClassConfLoadClassificationConfigFile(de_ctx, fd));
 
@@ -719,28 +722,24 @@ static int SCClassConfTest03(void)
 static int SCClassConfTest04(void)
 {
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
-    int result = 1;
-
-    if (de_ctx == NULL)
-        return 0;
+    FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
 
-    if (de_ctx->class_conf_ht == NULL)
-        return 0;
-
-    result = (de_ctx->class_conf_ht->count == 3);
+    FAIL_IF_NULL(de_ctx->class_conf_ht);
+    FAIL_IF_NOT(de_ctx->class_conf_ht->count == 3);
 
-    result &= (SCClassConfGetClasstype("unknown", de_ctx) != NULL);
-    result &= (SCClassConfGetClasstype("unKnoWn", de_ctx) != NULL);
-    result &= (SCClassConfGetClasstype("bamboo", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("bad-unknown", de_ctx) != NULL);
-    result &= (SCClassConfGetClasstype("BAD-UNKnOWN", de_ctx) != NULL);
-    result &= (SCClassConfGetClasstype("bed-unknown", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("unknown", de_ctx) != NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("unKnoWn", de_ctx) != NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bamboo", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bad-unknown", de_ctx) != NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("BAD-UNKnOWN", de_ctx) != NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bed-unknown", de_ctx) == NULL);
 
     DetectEngineCtxFree(de_ctx);
-    return result;
+    PASS;
 }
 
 /**
@@ -751,28 +750,24 @@ static int SCClassConfTest04(void)
 static int SCClassConfTest05(void)
 {
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
-    int result = 1;
-
-    if (de_ctx == NULL)
-        return 0;
+    FAIL_IF_NULL(de_ctx);
 
+    SCClassConfDeInitContext(de_ctx);
     FILE *fd = SCClassConfGenerateInvalidDummyClassConfigFD03();
     SCClassConfLoadClassificationConfigFile(de_ctx, fd);
 
-    if (de_ctx->class_conf_ht == NULL)
-        return 0;
-
-    result = (de_ctx->class_conf_ht->count == 0);
+    FAIL_IF_NULL(de_ctx->class_conf_ht);
+    FAIL_IF_NOT(de_ctx->class_conf_ht->count == 0);
 
-    result &= (SCClassConfGetClasstype("unknown", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("unKnoWn", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("bamboo", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("bad-unknown", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("BAD-UNKnOWN", de_ctx) == NULL);
-    result &= (SCClassConfGetClasstype("bed-unknown", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("unknown", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("unKnoWn", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bamboo", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bad-unknown", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("BAD-UNKnOWN", de_ctx) == NULL);
+    FAIL_IF_NOT(SCClassConfGetClasstype("bed-unknown", de_ctx) == NULL);
 
     DetectEngineCtxFree(de_ctx);
-    return result;
+    PASS;
 }
 
 /**