diff --git a/query_classifier/test/CMakeLists.txt b/query_classifier/test/CMakeLists.txt
index d66cd160a..f2e596ebe 100644
--- a/query_classifier/test/CMakeLists.txt
+++ b/query_classifier/test/CMakeLists.txt
@@ -111,5 +111,3 @@ if (BUILD_QC_MYSQLEMBEDDED)
     add_test(TestQC_Oracle-type_variables    compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test)
   endif()
 endif()
-
-add_subdirectory(canonical_tests)
diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt
index fc0f471eb..e5d7ae549 100644
--- a/server/core/test/CMakeLists.txt
+++ b/server/core/test/CMakeLists.txt
@@ -95,3 +95,4 @@ add_test(test_utils test_utils)
 add_test(test_session_track test_session_track)
 
 add_subdirectory(rest-api)
+add_subdirectory(canonical_tests)
diff --git a/query_classifier/test/canonical_tests/CMakeLists.txt b/server/core/test/canonical_tests/CMakeLists.txt
similarity index 97%
rename from query_classifier/test/canonical_tests/CMakeLists.txt
rename to server/core/test/canonical_tests/CMakeLists.txt
index d9b53751d..897a8c9ae 100644
--- a/query_classifier/test/canonical_tests/CMakeLists.txt
+++ b/server/core/test/canonical_tests/CMakeLists.txt
@@ -1,5 +1,4 @@
 # This test no longer requires the query classifier for canonicalization
-# TODO: Move these tests to the core test set
 add_executable(canonizer canonizer.c)
 target_link_libraries(canonizer maxscale-common)
 add_test(NAME CanonicalQuery COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh
diff --git a/query_classifier/test/canonical_tests/alter.expected b/server/core/test/canonical_tests/alter.expected
similarity index 100%
rename from query_classifier/test/canonical_tests/alter.expected
rename to server/core/test/canonical_tests/alter.expected
diff --git a/query_classifier/test/canonical_tests/alter.sql b/server/core/test/canonical_tests/alter.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/alter.sql
rename to server/core/test/canonical_tests/alter.sql
diff --git a/query_classifier/test/canonical_tests/canonizer.c b/server/core/test/canonical_tests/canonizer.c
similarity index 97%
rename from query_classifier/test/canonical_tests/canonizer.c
rename to server/core/test/canonical_tests/canonizer.c
index 3ec73359c..b07fafff9 100644
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/server/core/test/canonical_tests/canonizer.c
@@ -41,7 +41,7 @@ int main(int argc, char** argv)
         return 1;
     }
 
-    set_libdir(strdup("../../qc_sqlite/"));
+    set_libdir(strdup("../../../../query_classifier/qc_sqlite/"));
     set_datadir(strdup("/tmp"));
     set_langdir(strdup("."));
     set_process_datadir(strdup("/tmp"));
diff --git a/query_classifier/test/canonical_tests/canontest.sh b/server/core/test/canonical_tests/canontest.sh
similarity index 100%
rename from query_classifier/test/canonical_tests/canontest.sh
rename to server/core/test/canonical_tests/canontest.sh
diff --git a/query_classifier/test/canonical_tests/comment.expected b/server/core/test/canonical_tests/comment.expected
similarity index 100%
rename from query_classifier/test/canonical_tests/comment.expected
rename to server/core/test/canonical_tests/comment.expected
diff --git a/query_classifier/test/canonical_tests/comment.sql b/server/core/test/canonical_tests/comment.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/comment.sql
rename to server/core/test/canonical_tests/comment.sql
diff --git a/query_classifier/test/canonical_tests/expected.sql b/server/core/test/canonical_tests/expected.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/expected.sql
rename to server/core/test/canonical_tests/expected.sql
diff --git a/query_classifier/test/canonical_tests/input.sql b/server/core/test/canonical_tests/input.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/input.sql
rename to server/core/test/canonical_tests/input.sql
diff --git a/query_classifier/test/canonical_tests/select.expected b/server/core/test/canonical_tests/select.expected
similarity index 100%
rename from query_classifier/test/canonical_tests/select.expected
rename to server/core/test/canonical_tests/select.expected
diff --git a/query_classifier/test/canonical_tests/select.sql b/server/core/test/canonical_tests/select.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/select.sql
rename to server/core/test/canonical_tests/select.sql
diff --git a/query_classifier/test/canonical_tests/whitespace.expected b/server/core/test/canonical_tests/whitespace.expected
similarity index 100%
rename from query_classifier/test/canonical_tests/whitespace.expected
rename to server/core/test/canonical_tests/whitespace.expected
diff --git a/query_classifier/test/canonical_tests/whitespace.sql b/server/core/test/canonical_tests/whitespace.sql
similarity index 100%
rename from query_classifier/test/canonical_tests/whitespace.sql
rename to server/core/test/canonical_tests/whitespace.sql