diff --git a/query_classifier/test/CMakeLists.txt b/query_classifier/test/CMakeLists.txt
index 42e1a3fab..7c6a89a91 100644
--- a/query_classifier/test/CMakeLists.txt
+++ b/query_classifier/test/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Include the embedded library headers
 if (BUILD_QC_MYSQLEMBEDDED)
+  find_package(MySQL)
+
   subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR})
   foreach(DIR ${MYSQL_INCLUDE_DIR_ALL})
     include_directories(${DIR})
@@ -40,38 +42,40 @@ if (BUILD_QC_MYSQLEMBEDDED)
   add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test)
   add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
 
-  add_test(TestQC_Oracle-binlog_stm_ps     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_ps.test)
-  add_test(TestQC_Oracle-binlog_stm_sp     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_sp.test)
-  add_test(TestQC_Oracle-exception         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/exception.test)
-  add_test(TestQC_Oracle-func_case         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_case.test)
-  add_test(TestQC_Oracle-func_concat       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_concat.test)
-  add_test(TestQC_Oracle-func_decode       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_decode.test)
-  add_test(TestQC_Oracle-func_misc         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_misc.test)
-  add_test(TestQC_Oracle-misc              compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/misc.test)
-  add_test(TestQC_Oracle-ps                compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/ps.test)
-  add_test(TestQC_Oracle-sequence          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sequence.test)
-  add_test(TestQC_Oracle-sp-anonymous      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-anonymous.test)
-  add_test(TestQC_Oracle-sp-code           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-code.test)
-  add_test(TestQC_Oracle-sp-cursor-decl    compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor-decl.test)
-  add_test(TestQC_Oracle-sp-cursor-rowtype compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor-rowtype.test)
-  add_test(TestQC_Oracle-sp-cursor         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor.test)
-  add_test(TestQC_Oracle-sp-goto           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-goto.test)
-  add_test(TestQC_Oracle-sp-param_inc      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-param.inc)
-  add_test(TestQC_Oracle-sp-param          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-param.test)
-  add_test(TestQC_Oracle-sp-row            compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-row.test)
-  add_test(TestQC_Oracle-sp-row-vs-var_inc compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-row-vs-var.inc)
-  add_test(TestQC_Oracle-sp-security       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-security.test)
-  add_test(TestQC_Oracle-sp                compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp.test)
-  add_test(TestQC_Oracle-trigger           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/trigger.test)
-  add_test(TestQC_Oracle-truncate          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/truncate.test)
-  add_test(TestQC_Oracle-type_blob         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_blob.test)
-  add_test(TestQC_Oracle-type_clob         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_clob.test)
-  add_test(TestQC_Oracle-type_date         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_date.test)
-  add_test(TestQC_Oracle-type_number       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_number.test)
-  add_test(TestQC_Oracle-type_raw          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_raw.test)
-  add_test(TestQC_Oracle-type_varchar      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar.test)
-  add_test(TestQC_Oracle-type_varchar2     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar2.test)
-  add_test(TestQC_Oracle-type_variables    compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test)
+  if(NOT (MYSQL_EMBEDDED_VERSION VERSION_LESS 10.3))
+    add_test(TestQC_Oracle-binlog_stm_ps     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_ps.test)
+    add_test(TestQC_Oracle-binlog_stm_sp     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_sp.test)
+    add_test(TestQC_Oracle-exception         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/exception.test)
+    add_test(TestQC_Oracle-func_case         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_case.test)
+    add_test(TestQC_Oracle-func_concat       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_concat.test)
+    add_test(TestQC_Oracle-func_decode       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_decode.test)
+    add_test(TestQC_Oracle-func_misc         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/func_misc.test)
+    add_test(TestQC_Oracle-misc              compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/misc.test)
+    add_test(TestQC_Oracle-ps                compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/ps.test)
+    add_test(TestQC_Oracle-sequence          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sequence.test)
+    add_test(TestQC_Oracle-sp-anonymous      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-anonymous.test)
+    add_test(TestQC_Oracle-sp-code           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-code.test)
+    add_test(TestQC_Oracle-sp-cursor-decl    compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor-decl.test)
+    add_test(TestQC_Oracle-sp-cursor-rowtype compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor-rowtype.test)
+    add_test(TestQC_Oracle-sp-cursor         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-cursor.test)
+    add_test(TestQC_Oracle-sp-goto           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-goto.test)
+    add_test(TestQC_Oracle-sp-param_inc      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-param.inc)
+    add_test(TestQC_Oracle-sp-param          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-param.test)
+    add_test(TestQC_Oracle-sp-row            compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-row.test)
+    add_test(TestQC_Oracle-sp-row-vs-var_inc compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-row-vs-var.inc)
+    add_test(TestQC_Oracle-sp-security       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp-security.test)
+    add_test(TestQC_Oracle-sp                compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/sp.test)
+    add_test(TestQC_Oracle-trigger           compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/trigger.test)
+    add_test(TestQC_Oracle-truncate          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/truncate.test)
+    add_test(TestQC_Oracle-type_blob         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_blob.test)
+    add_test(TestQC_Oracle-type_clob         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_clob.test)
+    add_test(TestQC_Oracle-type_date         compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_date.test)
+    add_test(TestQC_Oracle-type_number       compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_number.test)
+    add_test(TestQC_Oracle-type_raw          compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_raw.test)
+    add_test(TestQC_Oracle-type_varchar      compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar.test)
+    add_test(TestQC_Oracle-type_varchar2     compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar2.test)
+    add_test(TestQC_Oracle-type_variables    compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test)
+  endif()
 endif()
 
 add_subdirectory(canonical_tests)