diff --git a/query_classifier/test/crash_qc_sqlite.cc b/query_classifier/test/crash_qc_sqlite.cc
index 97a14150a..b3d8fa3cf 100644
--- a/query_classifier/test/crash_qc_sqlite.cc
+++ b/query_classifier/test/crash_qc_sqlite.cc
@@ -44,9 +44,7 @@ int main()
 
     set_libdir(strdup("../qc_sqlite"));
 
-    if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL) &&
-        qc_process_init(QC_INIT_BOTH) &&
-        qc_thread_init(QC_INIT_BOTH))
+    if (qc_init(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL))
     {
         const char s[] = "SELECT @@global.max_allowed_packet";
 
@@ -58,7 +56,7 @@ int main()
         // code generator.
         qc_parse(stmt, QC_COLLECT_ALL);
 
-        qc_process_end(QC_INIT_BOTH);
+        qc_end();
 
         rv = EXIT_SUCCESS;
     }
diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc
index bc820927f..5d28883a3 100644
--- a/query_classifier/test/version_sensitivity.cc
+++ b/query_classifier/test/version_sensitivity.cc
@@ -131,16 +131,11 @@ int main(int argc, char* argv[])
 
         set_libdir(strdup(LIBDIR));
 
-        if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, QC_LIB, NULL))
+        if (qc_init(NULL, QC_SQL_MODE_DEFAULT, QC_LIB, NULL))
         {
-            if (qc_process_init(QC_INIT_BOTH) && qc_thread_init(QC_INIT_BOTH))
-            {
-                rc = test();
-            }
-            else
-            {
-                cerr << "error: Could not perform process/thread initialization for " << QC_LIB << "." << endl;
-            }
+            rc = test();
+
+            qc_end();
         }
         else
         {
diff --git a/server/core/test/canonical_tests/canonizer.cc b/server/core/test/canonical_tests/canonizer.cc
index 9f8ef831d..dc2c43d59 100644
--- a/server/core/test/canonical_tests/canonizer.cc
+++ b/server/core/test/canonical_tests/canonizer.cc
@@ -31,10 +31,12 @@ using std::endl;
 
 int main(int argc, char** argv)
 {
+    int rc = EXIT_FAILURE;
+
     if (argc != 3)
     {
         cout << "Usage: canonizer <input file> <output file>" << endl;
-        return 1;
+        return rc;
     }
 
     mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT);
@@ -43,7 +45,7 @@ int main(int argc, char** argv)
     if (!utils_init())
     {
         cout << "Utils library init failed." << endl;
-        return 1;
+        return rc;
     }
 
     set_libdir(strdup("../../../../query_classifier/qc_sqlite/"));
@@ -51,43 +53,46 @@ int main(int argc, char** argv)
     set_langdir(strdup("."));
     set_process_datadir(strdup("/tmp"));
 
-    qc_setup(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL);
-    qc_process_init(QC_INIT_BOTH);
-    qc_thread_init(QC_INIT_BOTH);
-
-    std::ifstream infile(argv[1]);
-    std::ofstream outfile(argv[2]);
-
-    if (!infile || !outfile)
+    if (qc_init(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL))
     {
-        cout << "Opening files failed." << endl;
-        return 1;
-    }
+        std::ifstream infile(argv[1]);
+        std::ofstream outfile(argv[2]);
 
-    for (std::string line; getline(infile, line);)
-    {
-        while (*line.rbegin() == '\n')
+        if (infile && outfile)
         {
-            line.resize(line.size() - 1);
+            for (std::string line; getline(infile, line);)
+            {
+                while (*line.rbegin() == '\n')
+                {
+                    line.resize(line.size() - 1);
+                }
+
+                if (!line.empty())
+                {
+                    size_t psize = line.size() + 1;
+                    mxs::Buffer buf(psize + 4);
+                    auto it = buf.begin();
+                    *it++ = (uint8_t)psize;
+                    *it++ = (uint8_t)(psize >> 8);
+                    *it++ = (uint8_t)(psize >> 16);
+                    *it++ = 0;
+                    *it++ = 3;
+                    std::copy(line.begin(), line.end(), it);
+                    char* tok = qc_get_canonical(buf.get());
+                    outfile <<  tok << endl;
+                    free(tok);
+                }
+            }
+
+            rc = EXIT_SUCCESS;
+        }
+        else
+        {
+            cout << "Opening files failed." << endl;
         }
 
-        if (!line.empty())
-        {
-            size_t psize = line.size() + 1;
-            mxs::Buffer buf(psize + 4);
-            auto it = buf.begin();
-            *it++ = (uint8_t)psize;
-            *it++ = (uint8_t)(psize >> 8);
-            *it++ = (uint8_t)(psize >> 16);
-            *it++ = 0;
-            *it++ = 3;
-            std::copy(line.begin(), line.end(), it);
-            char* tok = qc_get_canonical(buf.get());
-            outfile <<  tok << endl;
-            free(tok);
-        }
+        qc_end();
     }
 
-    qc_process_end(QC_INIT_BOTH);
-    return 0;
+    return rc;
 }
diff --git a/server/core/test/test_trxcompare.cc b/server/core/test/test_trxcompare.cc
index 8cbe7fd46..663985f4d 100644
--- a/server/core/test/test_trxcompare.cc
+++ b/server/core/test/test_trxcompare.cc
@@ -186,9 +186,7 @@ int main(int argc, char* argv[])
             set_libdir(strdup("../../../query_classifier/qc_sqlite"));
 
             // We have to setup something in order for the regexes to be compiled.
-            if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL)
-                && qc_process_init(QC_INIT_BOTH)
-                && qc_thread_init(QC_INIT_BOTH))
+            if (qc_init(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL))
             {
                 Tester tester(verbosity);
 
@@ -218,8 +216,7 @@ int main(int argc, char* argv[])
                     }
                 }
 
-                qc_thread_end(QC_INIT_BOTH);
-                qc_process_end(QC_INIT_BOTH);
+                qc_end();
             }
             else
             {
diff --git a/server/core/test/test_trxtracking.cc b/server/core/test/test_trxtracking.cc
index b94f7bfb4..17ac778a4 100644
--- a/server/core/test/test_trxtracking.cc
+++ b/server/core/test/test_trxtracking.cc
@@ -423,9 +423,7 @@ int main(int argc, char* argv[])
             set_libdir(strdup("../../../query_classifier/qc_sqlite"));
 
             // We have to setup something in order for the regexes to be compiled.
-            if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL)
-                && qc_process_init(QC_INIT_BOTH)
-                && qc_thread_init(QC_INIT_BOTH))
+            if (qc_init(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", NULL))
             {
                 rc = EXIT_SUCCESS;
 
@@ -451,8 +449,7 @@ int main(int argc, char* argv[])
                     cout << endl;
                 }
 
-                qc_thread_end(QC_INIT_BOTH);
-                qc_process_end(QC_INIT_BOTH);
+                qc_end();
             }
             else
             {
diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc
index a7de6478a..bb9f13a72 100644
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@@ -397,15 +397,12 @@ int main()
         pConfig->n_threads = 1;
 
         set_libdir(MXS_STRDUP_A("../../../../../query_classifier/qc_sqlite/"));
-        if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", "")
-            && qc_process_init(QC_INIT_BOTH)
-            && qc_thread_init(QC_INIT_BOTH))
+        if (qc_init(NULL, QC_SQL_MODE_DEFAULT, "qc_sqlite", ""))
         {
             set_libdir(MXS_STRDUP_A("../"));
             rc = test();
 
-            qc_thread_end(QC_INIT_BOTH);
-            qc_process_end(QC_INIT_BOTH);
+            qc_end();
         }
         else
         {
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index 1cca5674c..d4da3acc6 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -112,8 +112,7 @@ int main(int argc, char **argv)
     set_libdir(MXS_STRDUP_A("../../../../../query_classifier/qc_sqlite/"));
     load_module("qc_sqlite", MODULE_QUERY_CLASSIFIER);
 
-    qc_setup(NULL, QC_SQL_MODE_DEFAULT, NULL, NULL);
-    qc_process_init(QC_INIT_BOTH);
+    qc_init(NULL, QC_SQL_MODE_DEFAULT, NULL, NULL);
     hkinit();
 
     CONFIG_CONTEXT ctx{(char*)""};