diff --git a/Makefile.am b/Makefile.am
index 501fcfdf..5983c7c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,263 +89,8 @@ LOG_DRIVER = env $(SHELL) $(top_srcdir)/test/custom-test-driver
 AM_TESTS_ENVIRONMENT=AUTOMAKE_TESTS=true; export AUTOMAKE_TESTS;
 LOG_COMPILER=test/test-suite.sh
 
-# for i in `find test/test-cases -iname *.json`; do echo TESTS+=$i; done
 TESTS=
-TESTS+=test/test-cases/regression/action-allow.json
-TESTS+=test/test-cases/regression/action-block.json
-TESTS+=test/test-cases/regression/action-ctl_request_body_access.json
-TESTS+=test/test-cases/regression/action-ctl_request_body_processor.json
-TESTS+=test/test-cases/regression/action-ctl_request_body_processor_urlencoded.json
-TESTS+=test/test-cases/regression/action-ctl_rule_engine.json
-TESTS+=test/test-cases/regression/action-ctl_audit_engine.json
-TESTS+=test/test-cases/regression/action-ctl_rule_remove_by_id.json
-TESTS+=test/test-cases/regression/action-ctl_rule_remove_by_tag.json
-TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_id.json
-TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_tag.json
-TESTS+=test/test-cases/regression/action-disruptive.json
-TESTS+=test/test-cases/regression/action-exec.json
-TESTS+=test/test-cases/regression/action-expirevar.json
-TESTS+=test/test-cases/regression/action-id.json
-TESTS+=test/test-cases/regression/action-initcol.json
-TESTS+=test/test-cases/regression/action-msg.json
-TESTS+=test/test-cases/regression/action-setenv.json
-TESTS+=test/test-cases/regression/action-setrsc.json
-TESTS+=test/test-cases/regression/action-setsid.json
-TESTS+=test/test-cases/regression/action-setuid.json
-TESTS+=test/test-cases/regression/actions.json
-TESTS+=test/test-cases/regression/action-skip.json
-TESTS+=test/test-cases/regression/action-tag.json
-TESTS+=test/test-cases/regression/action-tnf-base64.json
-TESTS+=test/test-cases/regression/action-xmlns.json
-TESTS+=test/test-cases/regression/auditlog.json
-TESTS+=test/test-cases/regression/collection-case-insensitive.json
-TESTS+=test/test-cases/regression/collection-lua.json
-TESTS+=test/test-cases/regression/collection-regular_expression_selection.json
-TESTS+=test/test-cases/regression/collection-resource.json
-TESTS+=test/test-cases/regression/collection-tx.json
-TESTS+=test/test-cases/regression/collection-tx-with-macro.json
-TESTS+=test/test-cases/regression/config-body_limits.json
-TESTS+=test/test-cases/regression/config-calling_phases_by_name.json
-TESTS+=test/test-cases/regression/config-include-bad.json
-TESTS+=test/test-cases/regression/config-include.json
-TESTS+=test/test-cases/regression/config-remove_by_id.json
-TESTS+=test/test-cases/regression/config-remove_by_msg.json
-TESTS+=test/test-cases/regression/config-remove_by_tag.json
-TESTS+=test/test-cases/regression/config-response_type.json
-TESTS+=test/test-cases/regression/config-secdefaultaction.json
-TESTS+=test/test-cases/regression/config-secremoterules.json
-TESTS+=test/test-cases/regression/config-update-action-by-id.json
-TESTS+=test/test-cases/regression/config-update-target-by-id.json
-TESTS+=test/test-cases/regression/config-update-target-by-msg.json
-TESTS+=test/test-cases/regression/config-update-target-by-tag.json
-TESTS+=test/test-cases/regression/config-xml_external_entity.json
-TESTS+=test/test-cases/regression/debug_log.json
-TESTS+=test/test-cases/regression/directive-sec_rule_script.json
-TESTS+=test/test-cases/regression/issue-1152.json
-TESTS+=test/test-cases/regression/issue-1528.json
-TESTS+=test/test-cases/regression/issue-1565.json
-TESTS+=test/test-cases/regression/issue-1576.json
-TESTS+=test/test-cases/regression/issue-1591.json
-TESTS+=test/test-cases/regression/issue-1725.json
-TESTS+=test/test-cases/regression/issue-1743.json
-TESTS+=test/test-cases/regression/issue-1785.json
-TESTS+=test/test-cases/regression/issue-1812.json
-TESTS+=test/test-cases/regression/issue-1831.json
-TESTS+=test/test-cases/regression/issue-1844.json
-TESTS+=test/test-cases/regression/issue-1850.json
-TESTS+=test/test-cases/regression/issue-1941.json
-TESTS+=test/test-cases/regression/issue-1943.json
-TESTS+=test/test-cases/regression/issue-1956.json
-TESTS+=test/test-cases/regression/issue-1960.json
-TESTS+=test/test-cases/regression/issue-2099.json
-TESTS+=test/test-cases/regression/issue-2000.json
-TESTS+=test/test-cases/regression/issue-2111.json
-TESTS+=test/test-cases/regression/issue-2196.json
-TESTS+=test/test-cases/regression/issue-2423-msg-in-chain.json
-TESTS+=test/test-cases/regression/issue-2427.json
-TESTS+=test/test-cases/regression/issue-2296.json
-TESTS+=test/test-cases/regression/issue-394.json
-TESTS+=test/test-cases/regression/issue-849.json
-TESTS+=test/test-cases/regression/issue-960.json
-TESTS+=test/test-cases/regression/misc.json
-TESTS+=test/test-cases/regression/misc-variable-under-quotes.json
-TESTS+=test/test-cases/regression/offset-variable.json
-TESTS+=test/test-cases/regression/operator-detectsqli.json
-TESTS+=test/test-cases/regression/operator-detectxss.json
-TESTS+=test/test-cases/regression/operator-fuzzyhash.json
-TESTS+=test/test-cases/regression/operator-inpectFile.json
-TESTS+=test/test-cases/regression/operator-ipMatchFromFile.json
-TESTS+=test/test-cases/regression/operator-pm.json
-TESTS+=test/test-cases/regression/operator-rx.json
-TESTS+=test/test-cases/regression/operator-rxGlobal.json
-TESTS+=test/test-cases/regression/operator-UnconditionalMatch.json
-TESTS+=test/test-cases/regression/operator-validate-byte-range.json
-TESTS+=test/test-cases/regression/operator-verifycc.json
-TESTS+=test/test-cases/regression/operator-verifycpf.json
-TESTS+=test/test-cases/regression/operator-verifyssn.json
-TESTS+=test/test-cases/regression/operator-verifysvnr.json
-TESTS+=test/test-cases/regression/request-body-parser-json.json
-TESTS+=test/test-cases/regression/request-body-parser-multipart-crlf.json
-TESTS+=test/test-cases/regression/request-body-parser-multipart.json
-TESTS+=test/test-cases/regression/request-body-parser-xml.json
-TESTS+=test/test-cases/regression/request-body-parser-xml-validade-dtd.json
-TESTS+=test/test-cases/regression/rule-920120.json
-TESTS+=test/test-cases/regression/rule-920200.json
-TESTS+=test/test-cases/regression/rule-920274.json
-TESTS+=test/test-cases/regression/secaction.json
-TESTS+=test/test-cases/regression/secargumentslimit.json
-TESTS+=test/test-cases/regression/sec_component_signature.json
-TESTS+=test/test-cases/regression/secmarker.json
-TESTS+=test/test-cases/regression/secruleengine.json
-TESTS+=test/test-cases/regression/transformation-none.json
-TESTS+=test/test-cases/regression/transformations.json
-TESTS+=test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json
-TESTS+=test/test-cases/regression/variable-ARGS_GET.json
-TESTS+=test/test-cases/regression/variable-ARGS_GET_NAMES.json
-TESTS+=test/test-cases/regression/variable-ARGS.json
-TESTS+=test/test-cases/regression/variable-ARGS_NAMES.json
-TESTS+=test/test-cases/regression/variable-ARGS_POST.json
-TESTS+=test/test-cases/regression/variable-ARGS_POST_NAMES.json
-TESTS+=test/test-cases/regression/variable-AUTH_TYPE.json
-TESTS+=test/test-cases/regression/variable-DURATION.json
-TESTS+=test/test-cases/regression/variable-ENV.json
-TESTS+=test/test-cases/regression/variable-FILES_COMBINED_SIZE.json
-TESTS+=test/test-cases/regression/variable-FILES.json
-TESTS+=test/test-cases/regression/variable-FILES_NAMES.json
-TESTS+=test/test-cases/regression/variable-FILES_SIZES.json
-TESTS+=test/test-cases/regression/variable-FULL_REQUEST.json
-TESTS+=test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json
-TESTS+=test/test-cases/regression/variable-GEO.json
-TESTS+=test/test-cases/regression/variable-HIGHEST_SEVERITY.json
-TESTS+=test/test-cases/regression/variable-INBOUND_DATA_ERROR.json
-TESTS+=test/test-cases/regression/variable-MATCHED_VAR.json
-TESTS+=test/test-cases/regression/variable-MATCHED_VAR_NAME.json
-TESTS+=test/test-cases/regression/variable-MATCHED_VARS.json
-TESTS+=test/test-cases/regression/variable-MATCHED_VARS_NAMES.json
-TESTS+=test/test-cases/regression/variable-MODSEC_BUILD.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json
-TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json
-TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json
-TESTS+=test/test-cases/regression/variable-PATH_INFO.json
-TESTS+=test/test-cases/regression/variable-QUERY_STRING.json
-TESTS+=test/test-cases/regression/variable-REMOTE_ADDR.json
-TESTS+=test/test-cases/regression/variable-REMOTE_HOST.json
-TESTS+=test/test-cases/regression/variable-REMOTE_PORT.json
-TESTS+=test/test-cases/regression/variable-REMOTE_USER.json
-TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json
-TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR.json
-TESTS+=test/test-cases/regression/variable-REQUEST_BASENAME.json
-TESTS+=test/test-cases/regression/variable-REQUEST_BODY.json
-TESTS+=test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json
-TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES.json
-TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json
-TESTS+=test/test-cases/regression/variable-REQUEST_FILENAME.json
-TESTS+=test/test-cases/regression/variable-REQUEST_HEADERS.json
-TESTS+=test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json
-TESTS+=test/test-cases/regression/variable-REQUEST_LINE.json
-TESTS+=test/test-cases/regression/variable-REQUEST_METHOD.json
-TESTS+=test/test-cases/regression/variable-REQUEST_PROTOCOL.json
-TESTS+=test/test-cases/regression/variable-REQUEST_URI.json
-TESTS+=test/test-cases/regression/variable-REQUEST_URI_RAW.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_BODY.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_HEADERS.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json
-TESTS+=test/test-cases/regression/variable-RESPONSE_PROTOCOL.json
-TESTS+=test/test-cases/regression/variable-RULE.json
-TESTS+=test/test-cases/regression/variable-SERVER_ADDR.json
-TESTS+=test/test-cases/regression/variable-SERVER_NAME.json
-TESTS+=test/test-cases/regression/variable-SERVER_PORT.json
-TESTS+=test/test-cases/regression/variable-SESSIONID.json
-TESTS+=test/test-cases/regression/variable-STATUS.json
-TESTS+=test/test-cases/regression/variable-TIME_DAY.json
-TESTS+=test/test-cases/regression/variable-TIME_EPOCH.json
-TESTS+=test/test-cases/regression/variable-TIME_HOUR.json
-TESTS+=test/test-cases/regression/variable-TIME.json
-TESTS+=test/test-cases/regression/variable-TIME_MIN.json
-TESTS+=test/test-cases/regression/variable-TIME_MON.json
-TESTS+=test/test-cases/regression/variable-TIME_SEC.json
-TESTS+=test/test-cases/regression/variable-TIME_WDAY.json
-TESTS+=test/test-cases/regression/variable-TIME_YEAR.json
-TESTS+=test/test-cases/regression/variable-TX.json
-TESTS+=test/test-cases/regression/variable-UNIQUE_ID.json
-TESTS+=test/test-cases/regression/variable-URLENCODED_ERROR.json
-TESTS+=test/test-cases/regression/variable-USERID.json
-TESTS+=test/test-cases/regression/variable-variation-count.json
-TESTS+=test/test-cases/regression/variable-variation-exclusion.json
-TESTS+=test/test-cases/regression/variable-WEBAPPID.json
-TESTS+=test/test-cases/regression/variable-WEBSERVER_ERROR_LOG.json
-TESTS+=test/test-cases/regression/variable-XML.json
-TESTS+=test/test-cases/secrules-language-tests/operators/beginsWith.json
-TESTS+=test/test-cases/secrules-language-tests/operators/contains.json
-TESTS+=test/test-cases/secrules-language-tests/operators/containsWord.json
-TESTS+=test/test-cases/secrules-language-tests/operators/detectSQLi.json
-TESTS+=test/test-cases/secrules-language-tests/operators/detectXSS.json
-TESTS+=test/test-cases/secrules-language-tests/operators/endsWith.json
-TESTS+=test/test-cases/secrules-language-tests/operators/eq.json
-TESTS+=test/test-cases/secrules-language-tests/operators/ge.json
-TESTS+=test/test-cases/secrules-language-tests/operators/geoLookup.json
-TESTS+=test/test-cases/secrules-language-tests/operators/gt.json
-TESTS+=test/test-cases/secrules-language-tests/operators/ipMatch.json
-TESTS+=test/test-cases/secrules-language-tests/operators/le.json
-TESTS+=test/test-cases/secrules-language-tests/operators/lt.json
-TESTS+=test/test-cases/secrules-language-tests/operators/noMatch.json
-TESTS+=test/test-cases/secrules-language-tests/operators/pmFromFile.json
-TESTS+=test/test-cases/secrules-language-tests/operators/pm.json
-TESTS+=test/test-cases/secrules-language-tests/operators/rx.json
-TESTS+=test/test-cases/secrules-language-tests/operators/rxGlobal.json
-TESTS+=test/test-cases/secrules-language-tests/operators/streq.json
-TESTS+=test/test-cases/secrules-language-tests/operators/strmatch.json
-TESTS+=test/test-cases/secrules-language-tests/operators/unconditionalMatch.json
-TESTS+=test/test-cases/secrules-language-tests/operators/validateByteRange.json
-TESTS+=test/test-cases/secrules-language-tests/operators/validateUrlEncoding.json
-TESTS+=test/test-cases/secrules-language-tests/operators/validateUtf8Encoding.json
-TESTS+=test/test-cases/secrules-language-tests/operators/verifyCC.json
-TESTS+=test/test-cases/secrules-language-tests/operators/verifycpf.json
-TESTS+=test/test-cases/secrules-language-tests/operators/verifyssn.json
-TESTS+=test/test-cases/secrules-language-tests/operators/verifysvnr.json
-TESTS+=test/test-cases/secrules-language-tests/operators/within.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/base64DecodeExt.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/base64Decode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/base64Encode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/cmdLine.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/compressWhitespace.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/cssDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/escapeSeqDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/hexDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/hexEncode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/htmlEntityDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/jsDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/length.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/lowercase.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/md5.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/normalisePath.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/normalisePathWin.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/parityEven7bit.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/parityOdd7bit.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/parityZero7bit.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/removeCommentsChar.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/removeComments.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/removeNulls.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/removeWhitespace.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/replaceComments.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/replaceNulls.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/sha1.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/sqlHexDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/trim.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/trimLeft.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/trimRight.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/urlDecode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/urlDecodeUni.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/urlEncode.json
-TESTS+=test/test-cases/secrules-language-tests/transformations/utf8toUnicode.json
-
+include test/test-suite.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modsecurity.pc
diff --git a/build/win32/CMakeLists.txt b/build/win32/CMakeLists.txt
index f7bad3ba..9b52926c 100644
--- a/build/win32/CMakeLists.txt
+++ b/build/win32/CMakeLists.txt
@@ -151,6 +151,39 @@ add_regression_test_capability(WITH_CURL HAVE_CURL)
 add_regression_test_capability(WITH_LMDB HAVE_LMDB)
 add_regression_test_capability(WITH_MAXMIND HAVE_MAXMIND)
 
+enable_testing()
+
+file(READ ${BASE_DIR}/test/test-suite.in TEST_FILES_RAW)
+string(REPLACE "\n" ";" TEST_FILES ${TEST_FILES_RAW})
+
+foreach(TEST_FILE ${TEST_FILES})
+  # ignore comment lines
+  string(FIND ${TEST_FILE} "#" is_comment)
+  if(NOT is_comment EQUAL 0)
+    string(FIND ${TEST_FILE} "TESTS+=" is_valid_prefix)
+    if(NOT is_valid_prefix EQUAL 0)
+      message(FATAL_ERROR "Invalid prefix in line: ${TEST_FILE}")
+    endif()
+
+    # remove 'TESTS+=' prefix and 'test/' too because tests are launched
+    # from that directory
+    string(SUBSTRING ${TEST_FILE} 12 -1 TEST_FILE)
+
+    # test name
+    get_filename_component(TEST_NAME ${TEST_FILE} NAME_WE)
+
+    # determine test runner based on test path prefix
+    string(FIND ${TEST_FILE} "test-cases/regression/" is_regression_test)
+    if(is_regression_test EQUAL 0)
+        set(TEST_RUNNER "regression_tests")
+    else()
+        set(TEST_RUNNER "unit_tests")
+    endif()
+
+    add_test(NAME ${TEST_NAME} COMMAND ${TEST_RUNNER} ${TEST_FILE} WORKING_DIRECTORY ${BASE_DIR}/test)
+  endif()
+endforeach()
+
 # benchmark
 add_executable(benchmark ${BASE_DIR}/test/benchmark/benchmark.cc)
 setTestTargetProperties(benchmark)
diff --git a/build/win32/docker/Dockerfile b/build/win32/docker/Dockerfile
index 4967226e..1dc60482 100644
--- a/build/win32/docker/Dockerfile
+++ b/build/win32/docker/Dockerfile
@@ -77,6 +77,35 @@ ARG USE_ASAN=
 
 RUN C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat && vcbuild.bat %BUILD_TYPE% %ARCH% %USE_ASAN%
 
+# test suite
+#
+
+# setup test environment
+RUN cmd.exe /C md \tmp
+RUN cmd.exe /C md \bin
+RUN cmd.exe /C copy "C:\Program Files\GIT\usr\bin" \bin > NUL
+RUN cmd.exe /C copy "C:\Program Files\GIT\usr\bin\echo.exe" \bin\echo > NUL
+
+# disable tests that don't work on windows
+ARG JQ_VERSION=1.7.1
+ARG JQ_BINARY=jq-windows-amd64.exe
+ARG JQ_URL=https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/${JQ_BINARY}
+
+ARG JQ_BIN=C:\TEMP\jq.exe
+ADD ${JQ_URL} ${JQ_BIN}
+
+WORKDIR ${MOD_SECURITY_DIR}\test\test-cases\regression
+
+RUN %JQ_BIN% "map(if .title == \"Test match variable (1/n)\" then .enabled = 0 else . end)" issue-2423-msg-in-chain.json > tmp.json && move /Y tmp.json issue-2423-msg-in-chain.json
+RUN %JQ_BIN% "map(if .title == \"Test match variable (2/n)\" then .enabled = 0 else . end)" issue-2423-msg-in-chain.json > tmp.json && move /Y tmp.json issue-2423-msg-in-chain.json
+RUN %JQ_BIN% "map(if .title == \"Test match variable (3/n)\" then .enabled = 0 else . end)" issue-2423-msg-in-chain.json > tmp.json && move /Y tmp.json issue-2423-msg-in-chain.json
+RUN %JQ_BIN% "map(if .title == \"Variable offset - FILES_NAMES\" then .enabled = 0 else . end)" offset-variable.json > tmp.json && move /Y tmp.json offset-variable.json
+
+# run tests
+WORKDIR ${MOD_SECURITY_DIR}\build\win32\build
+
+RUN C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat && ctest -C %BUILD_TYPE% --output-on-failure
+
 # setup container's entrypoint
 #
 
diff --git a/test/custom-test-driver b/test/custom-test-driver
index aa490ee6..d9b0d0ff 100755
--- a/test/custom-test-driver
+++ b/test/custom-test-driver
@@ -42,9 +42,9 @@ print_usage ()
 {
   cat <<END
 Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              [--expect-failure {yes|no}] [--color-tests {yes|no}]
+              [--enable-hard-errors {yes|no}] [--]
               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
diff --git a/test/regression/regression.cc b/test/regression/regression.cc
index a5c4832d..1420ddcd 100644
--- a/test/regression/regression.cc
+++ b/test/regression/regression.cc
@@ -64,13 +64,11 @@ bool contains(const std::string &s, const std::string &pattern) {
 
 void clearAuditLog(const std::string &filename) {
     if (!filename.empty()) {
-        std::ifstream file;
-        file.open(filename.c_str(), std::ifstream::out | std::ifstream::trunc);
+        std::ofstream file{filename.c_str(), std::ofstream::out | std::ofstream::trunc};
         if (!file.is_open() || file.fail()) {
             std::cout << std::endl << "Failed to clear previous contents of audit log: " \
                 << filename << std::endl;
         }
-        file.close();
     }
 }
 std::string getAuditLogContent(const std::string &filename) {
@@ -510,6 +508,7 @@ int main(int argc, char **argv) {
 #ifdef NO_LOGS
     std::cout << "Test utility cannot work without logging support." \
         << std::endl;
+    return 0;
 #else
     test.cmd_options(argc, argv);
     if (!test.m_automake_output && !test.m_count_all) {
@@ -609,6 +608,6 @@ int main(int argc, char **argv) {
         delete vec;
     }
 
+    return failed;
 #endif
-    return 0;
 }
diff --git a/test/test-cases/regression/offset-variable.json b/test/test-cases/regression/offset-variable.json
index 9aa5120c..7ffe9299 100644
--- a/test/test-cases/regression/offset-variable.json
+++ b/test/test-cases/regression/offset-variable.json
@@ -215,7 +215,6 @@
       ]
     },
     "expected":{
-      // should not match
     },
     "rules":[
       "SecRequestBodyAccess On",
@@ -248,7 +247,6 @@
       ]
     },
     "expected":{
-      // should not match
     },
     "rules":[
       "SecRequestBodyAccess On",
diff --git a/test/test-suite.in b/test/test-suite.in
new file mode 100644
index 00000000..eee696ec
--- /dev/null
+++ b/test/test-suite.in
@@ -0,0 +1,255 @@
+# for i in `find test/test-cases -iname *.json`; do echo TESTS+=$i; done
+TESTS+=test/test-cases/regression/action-allow.json
+TESTS+=test/test-cases/regression/action-block.json
+TESTS+=test/test-cases/regression/action-ctl_request_body_access.json
+TESTS+=test/test-cases/regression/action-ctl_request_body_processor.json
+TESTS+=test/test-cases/regression/action-ctl_request_body_processor_urlencoded.json
+TESTS+=test/test-cases/regression/action-ctl_rule_engine.json
+TESTS+=test/test-cases/regression/action-ctl_audit_engine.json
+TESTS+=test/test-cases/regression/action-ctl_rule_remove_by_id.json
+TESTS+=test/test-cases/regression/action-ctl_rule_remove_by_tag.json
+TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_id.json
+TESTS+=test/test-cases/regression/action-ctl_rule_remove_target_by_tag.json
+TESTS+=test/test-cases/regression/action-disruptive.json
+TESTS+=test/test-cases/regression/action-exec.json
+TESTS+=test/test-cases/regression/action-expirevar.json
+TESTS+=test/test-cases/regression/action-id.json
+TESTS+=test/test-cases/regression/action-initcol.json
+TESTS+=test/test-cases/regression/action-msg.json
+TESTS+=test/test-cases/regression/action-setenv.json
+TESTS+=test/test-cases/regression/action-setrsc.json
+TESTS+=test/test-cases/regression/action-setsid.json
+TESTS+=test/test-cases/regression/action-setuid.json
+TESTS+=test/test-cases/regression/actions.json
+TESTS+=test/test-cases/regression/action-skip.json
+TESTS+=test/test-cases/regression/action-tag.json
+TESTS+=test/test-cases/regression/action-tnf-base64.json
+TESTS+=test/test-cases/regression/action-xmlns.json
+TESTS+=test/test-cases/regression/auditlog.json
+TESTS+=test/test-cases/regression/collection-case-insensitive.json
+TESTS+=test/test-cases/regression/collection-lua.json
+TESTS+=test/test-cases/regression/collection-regular_expression_selection.json
+TESTS+=test/test-cases/regression/collection-resource.json
+TESTS+=test/test-cases/regression/collection-tx.json
+TESTS+=test/test-cases/regression/collection-tx-with-macro.json
+TESTS+=test/test-cases/regression/config-body_limits.json
+TESTS+=test/test-cases/regression/config-calling_phases_by_name.json
+TESTS+=test/test-cases/regression/config-include-bad.json
+TESTS+=test/test-cases/regression/config-include.json
+TESTS+=test/test-cases/regression/config-remove_by_id.json
+TESTS+=test/test-cases/regression/config-remove_by_msg.json
+TESTS+=test/test-cases/regression/config-remove_by_tag.json
+TESTS+=test/test-cases/regression/config-response_type.json
+TESTS+=test/test-cases/regression/config-secdefaultaction.json
+TESTS+=test/test-cases/regression/config-secremoterules.json
+TESTS+=test/test-cases/regression/config-update-action-by-id.json
+TESTS+=test/test-cases/regression/config-update-target-by-id.json
+TESTS+=test/test-cases/regression/config-update-target-by-msg.json
+TESTS+=test/test-cases/regression/config-update-target-by-tag.json
+TESTS+=test/test-cases/regression/config-xml_external_entity.json
+TESTS+=test/test-cases/regression/debug_log.json
+TESTS+=test/test-cases/regression/directive-sec_rule_script.json
+TESTS+=test/test-cases/regression/issue-1152.json
+TESTS+=test/test-cases/regression/issue-1528.json
+TESTS+=test/test-cases/regression/issue-1565.json
+TESTS+=test/test-cases/regression/issue-1576.json
+TESTS+=test/test-cases/regression/issue-1591.json
+TESTS+=test/test-cases/regression/issue-1725.json
+TESTS+=test/test-cases/regression/issue-1743.json
+TESTS+=test/test-cases/regression/issue-1785.json
+TESTS+=test/test-cases/regression/issue-1812.json
+TESTS+=test/test-cases/regression/issue-1831.json
+TESTS+=test/test-cases/regression/issue-1844.json
+TESTS+=test/test-cases/regression/issue-1850.json
+TESTS+=test/test-cases/regression/issue-1941.json
+TESTS+=test/test-cases/regression/issue-1943.json
+TESTS+=test/test-cases/regression/issue-1956.json
+TESTS+=test/test-cases/regression/issue-1960.json
+TESTS+=test/test-cases/regression/issue-2099.json
+TESTS+=test/test-cases/regression/issue-2000.json
+TESTS+=test/test-cases/regression/issue-2111.json
+TESTS+=test/test-cases/regression/issue-2196.json
+TESTS+=test/test-cases/regression/issue-2423-msg-in-chain.json
+TESTS+=test/test-cases/regression/issue-2427.json
+TESTS+=test/test-cases/regression/issue-2296.json
+TESTS+=test/test-cases/regression/issue-394.json
+TESTS+=test/test-cases/regression/issue-849.json
+TESTS+=test/test-cases/regression/issue-960.json
+TESTS+=test/test-cases/regression/misc.json
+TESTS+=test/test-cases/regression/misc-variable-under-quotes.json
+TESTS+=test/test-cases/regression/offset-variable.json
+TESTS+=test/test-cases/regression/operator-detectsqli.json
+TESTS+=test/test-cases/regression/operator-detectxss.json
+TESTS+=test/test-cases/regression/operator-fuzzyhash.json
+TESTS+=test/test-cases/regression/operator-inpectFile.json
+TESTS+=test/test-cases/regression/operator-ipMatchFromFile.json
+TESTS+=test/test-cases/regression/operator-pm.json
+TESTS+=test/test-cases/regression/operator-rx.json
+TESTS+=test/test-cases/regression/operator-rxGlobal.json
+TESTS+=test/test-cases/regression/operator-UnconditionalMatch.json
+TESTS+=test/test-cases/regression/operator-validate-byte-range.json
+TESTS+=test/test-cases/regression/operator-verifycc.json
+TESTS+=test/test-cases/regression/operator-verifycpf.json
+TESTS+=test/test-cases/regression/operator-verifyssn.json
+TESTS+=test/test-cases/regression/operator-verifysvnr.json
+TESTS+=test/test-cases/regression/request-body-parser-json.json
+TESTS+=test/test-cases/regression/request-body-parser-multipart-crlf.json
+TESTS+=test/test-cases/regression/request-body-parser-multipart.json
+TESTS+=test/test-cases/regression/request-body-parser-xml.json
+TESTS+=test/test-cases/regression/request-body-parser-xml-validade-dtd.json
+TESTS+=test/test-cases/regression/rule-920120.json
+TESTS+=test/test-cases/regression/rule-920200.json
+TESTS+=test/test-cases/regression/rule-920274.json
+TESTS+=test/test-cases/regression/secaction.json
+TESTS+=test/test-cases/regression/secargumentslimit.json
+TESTS+=test/test-cases/regression/sec_component_signature.json
+TESTS+=test/test-cases/regression/secmarker.json
+TESTS+=test/test-cases/regression/secruleengine.json
+TESTS+=test/test-cases/regression/transformation-none.json
+TESTS+=test/test-cases/regression/transformations.json
+TESTS+=test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json
+TESTS+=test/test-cases/regression/variable-ARGS_GET.json
+TESTS+=test/test-cases/regression/variable-ARGS_GET_NAMES.json
+TESTS+=test/test-cases/regression/variable-ARGS.json
+TESTS+=test/test-cases/regression/variable-ARGS_NAMES.json
+TESTS+=test/test-cases/regression/variable-ARGS_POST.json
+TESTS+=test/test-cases/regression/variable-ARGS_POST_NAMES.json
+TESTS+=test/test-cases/regression/variable-AUTH_TYPE.json
+TESTS+=test/test-cases/regression/variable-DURATION.json
+TESTS+=test/test-cases/regression/variable-ENV.json
+TESTS+=test/test-cases/regression/variable-FILES_COMBINED_SIZE.json
+TESTS+=test/test-cases/regression/variable-FILES.json
+TESTS+=test/test-cases/regression/variable-FILES_NAMES.json
+TESTS+=test/test-cases/regression/variable-FILES_SIZES.json
+TESTS+=test/test-cases/regression/variable-FULL_REQUEST.json
+TESTS+=test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json
+TESTS+=test/test-cases/regression/variable-GEO.json
+TESTS+=test/test-cases/regression/variable-HIGHEST_SEVERITY.json
+TESTS+=test/test-cases/regression/variable-INBOUND_DATA_ERROR.json
+TESTS+=test/test-cases/regression/variable-MATCHED_VAR.json
+TESTS+=test/test-cases/regression/variable-MATCHED_VAR_NAME.json
+TESTS+=test/test-cases/regression/variable-MATCHED_VARS.json
+TESTS+=test/test-cases/regression/variable-MATCHED_VARS_NAMES.json
+TESTS+=test/test-cases/regression/variable-MODSEC_BUILD.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json
+TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json
+TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json
+TESTS+=test/test-cases/regression/variable-PATH_INFO.json
+TESTS+=test/test-cases/regression/variable-QUERY_STRING.json
+TESTS+=test/test-cases/regression/variable-REMOTE_ADDR.json
+TESTS+=test/test-cases/regression/variable-REMOTE_HOST.json
+TESTS+=test/test-cases/regression/variable-REMOTE_PORT.json
+TESTS+=test/test-cases/regression/variable-REMOTE_USER.json
+TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json
+TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR.json
+TESTS+=test/test-cases/regression/variable-REQUEST_BASENAME.json
+TESTS+=test/test-cases/regression/variable-REQUEST_BODY.json
+TESTS+=test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json
+TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES.json
+TESTS+=test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json
+TESTS+=test/test-cases/regression/variable-REQUEST_FILENAME.json
+TESTS+=test/test-cases/regression/variable-REQUEST_HEADERS.json
+TESTS+=test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json
+TESTS+=test/test-cases/regression/variable-REQUEST_LINE.json
+TESTS+=test/test-cases/regression/variable-REQUEST_METHOD.json
+TESTS+=test/test-cases/regression/variable-REQUEST_PROTOCOL.json
+TESTS+=test/test-cases/regression/variable-REQUEST_URI.json
+TESTS+=test/test-cases/regression/variable-REQUEST_URI_RAW.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_BODY.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_HEADERS.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json
+TESTS+=test/test-cases/regression/variable-RESPONSE_PROTOCOL.json
+TESTS+=test/test-cases/regression/variable-RULE.json
+TESTS+=test/test-cases/regression/variable-SERVER_ADDR.json
+TESTS+=test/test-cases/regression/variable-SERVER_NAME.json
+TESTS+=test/test-cases/regression/variable-SERVER_PORT.json
+TESTS+=test/test-cases/regression/variable-SESSIONID.json
+TESTS+=test/test-cases/regression/variable-STATUS.json
+TESTS+=test/test-cases/regression/variable-TIME_DAY.json
+TESTS+=test/test-cases/regression/variable-TIME_EPOCH.json
+TESTS+=test/test-cases/regression/variable-TIME_HOUR.json
+TESTS+=test/test-cases/regression/variable-TIME.json
+TESTS+=test/test-cases/regression/variable-TIME_MIN.json
+TESTS+=test/test-cases/regression/variable-TIME_MON.json
+TESTS+=test/test-cases/regression/variable-TIME_SEC.json
+TESTS+=test/test-cases/regression/variable-TIME_WDAY.json
+TESTS+=test/test-cases/regression/variable-TIME_YEAR.json
+TESTS+=test/test-cases/regression/variable-TX.json
+TESTS+=test/test-cases/regression/variable-UNIQUE_ID.json
+TESTS+=test/test-cases/regression/variable-URLENCODED_ERROR.json
+TESTS+=test/test-cases/regression/variable-USERID.json
+TESTS+=test/test-cases/regression/variable-variation-count.json
+TESTS+=test/test-cases/regression/variable-variation-exclusion.json
+TESTS+=test/test-cases/regression/variable-WEBAPPID.json
+TESTS+=test/test-cases/regression/variable-WEBSERVER_ERROR_LOG.json
+TESTS+=test/test-cases/regression/variable-XML.json
+TESTS+=test/test-cases/secrules-language-tests/operators/beginsWith.json
+TESTS+=test/test-cases/secrules-language-tests/operators/contains.json
+TESTS+=test/test-cases/secrules-language-tests/operators/containsWord.json
+TESTS+=test/test-cases/secrules-language-tests/operators/detectSQLi.json
+TESTS+=test/test-cases/secrules-language-tests/operators/detectXSS.json
+TESTS+=test/test-cases/secrules-language-tests/operators/endsWith.json
+TESTS+=test/test-cases/secrules-language-tests/operators/eq.json
+TESTS+=test/test-cases/secrules-language-tests/operators/ge.json
+TESTS+=test/test-cases/secrules-language-tests/operators/geoLookup.json
+TESTS+=test/test-cases/secrules-language-tests/operators/gt.json
+TESTS+=test/test-cases/secrules-language-tests/operators/ipMatch.json
+TESTS+=test/test-cases/secrules-language-tests/operators/le.json
+TESTS+=test/test-cases/secrules-language-tests/operators/lt.json
+TESTS+=test/test-cases/secrules-language-tests/operators/noMatch.json
+TESTS+=test/test-cases/secrules-language-tests/operators/pmFromFile.json
+TESTS+=test/test-cases/secrules-language-tests/operators/pm.json
+TESTS+=test/test-cases/secrules-language-tests/operators/rx.json
+TESTS+=test/test-cases/secrules-language-tests/operators/rxGlobal.json
+TESTS+=test/test-cases/secrules-language-tests/operators/streq.json
+TESTS+=test/test-cases/secrules-language-tests/operators/strmatch.json
+TESTS+=test/test-cases/secrules-language-tests/operators/unconditionalMatch.json
+TESTS+=test/test-cases/secrules-language-tests/operators/validateByteRange.json
+TESTS+=test/test-cases/secrules-language-tests/operators/validateUrlEncoding.json
+TESTS+=test/test-cases/secrules-language-tests/operators/validateUtf8Encoding.json
+TESTS+=test/test-cases/secrules-language-tests/operators/verifyCC.json
+TESTS+=test/test-cases/secrules-language-tests/operators/verifycpf.json
+TESTS+=test/test-cases/secrules-language-tests/operators/verifyssn.json
+TESTS+=test/test-cases/secrules-language-tests/operators/verifysvnr.json
+TESTS+=test/test-cases/secrules-language-tests/operators/within.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/base64DecodeExt.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/base64Decode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/base64Encode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/cmdLine.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/compressWhitespace.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/cssDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/escapeSeqDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/hexDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/hexEncode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/htmlEntityDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/jsDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/length.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/lowercase.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/md5.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/normalisePath.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/normalisePathWin.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/parityEven7bit.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/parityOdd7bit.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/parityZero7bit.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/removeCommentsChar.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/removeComments.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/removeNulls.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/removeWhitespace.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/replaceComments.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/replaceNulls.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/sha1.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/sqlHexDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/trim.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/trimLeft.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/trimRight.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/urlDecode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/urlDecodeUni.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/urlEncode.json
+TESTS+=test/test-cases/secrules-language-tests/transformations/utf8toUnicode.json
diff --git a/test/test-suite.sh b/test/test-suite.sh
index ce03c244..20262239 100755
--- a/test/test-suite.sh
+++ b/test/test-suite.sh
@@ -13,7 +13,7 @@ then
     AMOUNT=$(./regression_tests countall ../$FILE)
     RET=$?
     if [ $RET -ne 0 ]; then
-        echo ":test-result: SKIP: json is not enabled. (regression/$RET) ../$FILE:$i"
+        echo ":test-result: SKIP: json is not enabled. (regression/$RET) ../$FILE"
         exit 0
     fi
 
@@ -30,10 +30,10 @@ else
       RET=$?
       if [ $RET -eq 127 ]
       then
-          echo ":test-result: SKIP: json is not enabled. (unit/$RET) ../$FILE:$i"
+          echo ":test-result: SKIP: json is not enabled. (unit/$RET) ../$FILE"
       elif [ $RET -ne 0 ]
       then
-          echo ":test-result: FAIL possible segfault: (unit/$RET) ../$FILE:$i"
+          echo ":test-result: FAIL possible segfault: (unit/$RET) ../$FILE"
       fi
 fi
 
diff --git a/test/unit/unit.cc b/test/unit/unit.cc
index 4d75ba94..46013ec7 100644
--- a/test/unit/unit.cc
+++ b/test/unit/unit.cc
@@ -195,6 +195,10 @@ int main(int argc, char **argv) {
         std::cout << t->print() << std::endl;
     }
 
+    const int skp = std::count_if(results.cbegin(), results.cend(), [](const auto &i)
+                                    { return i->skipped; });
+    const int failed = results.size() - skp;
+
     if (!test.m_automake_output) {
         std::cout << std::endl;
 
@@ -202,13 +206,7 @@ int main(int argc, char **argv) {
         if (results.size() == 0) {
             std::cout << KGRN << "All tests passed" << RESET << std::endl;
         } else {
-            int skp = 0;
-            for (const auto &i : results) {
-                if (i->skipped == true) {
-                    skp++;
-                }
-            }
-            std::cout << KRED << results.size()-skp << " failed.";
+            std::cout << KRED << failed << " failed.";
             std::cout << RESET << std::endl;
             if (skp > 0) {
                 std::cout << " " << std::to_string(skp) << " ";
@@ -217,13 +215,12 @@ int main(int argc, char **argv) {
         }
     }
 
-    for (std::pair<std::string, std::vector<UnitTest *> *> a : test) {
-        std::vector<UnitTest *> *vec = a.second;
-        for (int i = 0; i < vec->size(); i++) {
-            delete vec->at(i);
-        }
+    for (auto a : test) {
+        auto *vec = a.second;
+        for(auto *t : *vec)
+            delete t;
         delete vec;
     }
+
+    return failed;
 }
-
-