diff --git a/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h b/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
--- a/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
+++ b/src/core-impl/storage/sql/mysql-shared/MySqlStorage.h
@@ -19,6 +19,7 @@
 #define AMAROK_STORAGE_MYSQLSTORAGE_H
 
 #include "core/storage/SqlStorage.h"
+#include <mysql/mysql_version.h>
 
 
 #include <QMutex>
@@ -28,8 +29,13 @@
   #include <winsock2.h>
 #endif
 
+#if defined(MARIADB_VERSION_ID) || MYSQL_VERSION_ID < 60000
 struct st_mysql;
 typedef struct st_mysql MYSQL;
+#else
+struct MYSQL;
+using my_bool = bool;
+#endif
 
 /**
  * Implements a SqlStorage using a MySQL backend
diff --git a/tests/core-impl/collections/CMakeLists.txt b/tests/core-impl/collections/CMakeLists.txt
--- a/tests/core-impl/collections/CMakeLists.txt
+++ b/tests/core-impl/collections/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_subdirectory( aggregate )
-add_subdirectory( db/sql )
+if( BUILD_MYSQLE_COLLECTION )
+    add_subdirectory( db/sql )
+endif()
 add_subdirectory( support )