diff --git a/appveyor.yml b/appveyor.yml
index eb6fc4b2fc9..c9703d631ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,10 +39,10 @@ before_test:
         Pop-Location
       }
       'MySQL' {
-        Start-Service 'MySQL57'
+        Start-Service 'MySQL80'
         # Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll)
         $env:MYSQL_PWD = 'Password12!'
-        & 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
+        & 'C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
       }
       'Odbc' { Start-Service 'MSSQL$SQL2017' }
       'PostgreSQL' {
diff --git a/src/NHibernate.Test/Async/Linq/MethodCallTests.cs b/src/NHibernate.Test/Async/Linq/MethodCallTests.cs
index b3ba92bef4f..621aed6d57c 100644
--- a/src/NHibernate.Test/Async/Linq/MethodCallTests.cs
+++ b/src/NHibernate.Test/Async/Linq/MethodCallTests.cs
@@ -59,6 +59,7 @@ public async Task CanExecuteCountWithOrderByArgumentsAsync()
 		public async Task CanSelectPropertiesIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
 				.FirstAsync());
 
@@ -71,6 +72,7 @@ public async Task CanSelectPropertiesIntoObjectArrayAsync()
 		public async Task CanSelectComponentsIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Component, u.Component.OtherComponent})
 				.FirstAsync());
 
@@ -106,6 +108,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
 			const string name = "Julian";
 
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
 				.FirstAsync());
 
@@ -119,6 +122,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync()
 		public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
 				.FirstAsync());
 
@@ -131,6 +135,7 @@ public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync()
 		public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
 				.FirstAsync());
 
@@ -144,6 +149,7 @@ public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync()
 		public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
 		{
 			var result = await (db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
 				.FirstAsync());
 
@@ -156,7 +162,7 @@ public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync()
 		[Test, Description("NH-2744")]
 		public async Task CanSelectPropertiesIntoNestedObjectArraysAsync()
 		{
-			var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
+			var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
 			var result = await (query.FirstAsync());
 
 			Assert.That(result.Length, Is.EqualTo(2));
diff --git a/src/NHibernate.Test/Extralazy/UserGroup.hbm.xml b/src/NHibernate.Test/Extralazy/UserGroup.hbm.xml
index 2dd3fb6433d..0bd06b06d9e 100644
--- a/src/NHibernate.Test/Extralazy/UserGroup.hbm.xml
+++ b/src/NHibernate.Test/Extralazy/UserGroup.hbm.xml
@@ -4,7 +4,7 @@
 				   assembly="NHibernate.Test"
 				   namespace="NHibernate.Test.Extralazy">
 
-	<class name="Group" table="groups">
+	<class name="Group" table="`groups`">
 		<id name="Name"/>
 		<map name="Users" cascade="persist" table="group_user" lazy="extra">
 			<key column="groupName"/>
diff --git a/src/NHibernate.Test/Linq/MethodCallTests.cs b/src/NHibernate.Test/Linq/MethodCallTests.cs
index c330b0944da..05abb79c0af 100644
--- a/src/NHibernate.Test/Linq/MethodCallTests.cs
+++ b/src/NHibernate.Test/Linq/MethodCallTests.cs
@@ -47,6 +47,7 @@ public void CanExecuteCountWithOrderByArguments()
 		public void CanSelectPropertiesIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
 				.First();
 
@@ -59,6 +60,7 @@ public void CanSelectPropertiesIntoObjectArray()
 		public void CanSelectComponentsIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Component, u.Component.OtherComponent})
 				.First();
 
@@ -94,6 +96,7 @@ public void CanSelectConstantsIntoObjectArray()
 			const string name = "Julian";
 
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
 				.First();
 
@@ -107,6 +110,7 @@ public void CanSelectConstantsIntoObjectArray()
 		public void CanSelectPropertiesFromAssociationsIntoObjectArray()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
 				.First();
 
@@ -119,6 +123,7 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray()
 		public void CanSelectPropertiesIntoObjectArrayInProperty()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } })
 				.First();
 
@@ -132,6 +137,7 @@ public void CanSelectPropertiesIntoObjectArrayInProperty()
 		public void CanSelectPropertiesIntoPropertyListInProperty()
 		{
 			var result = db.Users
+				.OrderBy(u => u.Id)
 				.Select(u => new { Cells = new List<object> { u.Id, u.Name, new object[u.Id] } })
 				.First();
 
@@ -144,7 +150,7 @@ public void CanSelectPropertiesIntoPropertyListInProperty()
 		[Test, Description("NH-2744")]
 		public void CanSelectPropertiesIntoNestedObjectArrays()
 		{
-			var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
+			var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
 			var result = query.First();
 
 			Assert.That(result.Length, Is.EqualTo(2));
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2113/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/NH2113/Mappings.hbm.xml
index 64151c2d8bc..d5e799d7c91 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2113/Mappings.hbm.xml
+++ b/src/NHibernate.Test/NHSpecificTest/NH2113/Mappings.hbm.xml
@@ -15,7 +15,7 @@
     <property name="Name" />
 	</class>
 
-  <class name="Group" table="Groups">
+  <class name="Group" table="`Groups`">
     <id name="Id" column="GroupID">
       <generator class="increment"/>
     </id>
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2907/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/NH2907/Mappings.hbm.xml
index bb35dc0ba6a..95c5fdeec3d 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2907/Mappings.hbm.xml
+++ b/src/NHibernate.Test/NHSpecificTest/NH2907/Mappings.hbm.xml
@@ -12,11 +12,11 @@
 		<property name="Name" type="string"/>
 	</class>
 
-	<class name="Group" table="groups">
+	<class name="Group" table="`groups`">
 		<id name="Id">
 			<column name="GroupId"/>
 			<generator class="native"/>
 		</id>
 		<property name="Name" type="string"/>
 	</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
index 80b7b5f6b24..e5e553f5b30 100644
--- a/src/NHibernate.Test/NHibernate.Test.csproj
+++ b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -67,7 +67,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.5.2" />
     <PackageReference Include="Npgsql" Version="6.0.6" />
-    <PackageReference Include="MySql.Data" Version="8.0.27" />
+    <PackageReference Include="MySql.Data" Version="8.0.30" />
   </ItemGroup>
   <ItemGroup Condition="$(NhNetFx)">
     <Reference Include="System.Configuration" />