diff --git a/appveyor.yml b/appveyor.yml
index 30ed2775..196b9ab0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,13 +5,16 @@ cache:
 
 clone_folder: c:\projects\dibi
 
+environment:
+    MYSQL_PWD: Password12!
+
 services:
     - mssql2012sp1
 #    - mssql2014
     - mysql
 
 init:
-    - SET PATH=c:\php;%PATH%
+    - SET PATH=c:\php;c:\Program Files\MySQL\MySQL Server 5.7\bin;%PATH%
     - SET ANSICON=121x90 (121x90)
 
 install:
@@ -40,6 +43,10 @@ install:
     # Create databases.ini
     - copy tests\databases.appveyor.ini tests\databases.ini
 
+before_test:
+    # Create MySQL database
+    - mysql --user=root -e "CREATE DATABASE dibi_test"
+
 test_script:
     - vendor\bin\tester tests -s -p c:\php\php -c tests\php-win.ini
 
diff --git a/tests/databases.appveyor.ini b/tests/databases.appveyor.ini
index 0e8c9243..35c13879 100644
--- a/tests/databases.appveyor.ini
+++ b/tests/databases.appveyor.ini
@@ -13,12 +13,13 @@ driver = mysqli
 host = 127.0.0.1
 username = root
 password = "Password12!"
+database = dibi_test
 charset = utf8
 system = mysql
 
 [mysql pdo]
 driver = pdo
-dsn = "mysql:host=127.0.0.1"
+dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
 username = root
 password = "Password12!"
 system = mysql
diff --git a/tests/databases.sample.ini b/tests/databases.sample.ini
index 4b747b6e..4cb41f0b 100644
--- a/tests/databases.sample.ini
+++ b/tests/databases.sample.ini
@@ -13,12 +13,13 @@ driver = mysqli
 host = 127.0.0.1
 username = root
 password =
+database = dibi_test
 charset = utf8
 system = mysql
 
 [mysql pdo]
 driver = pdo
-dsn = "mysql:host=127.0.0.1"
+dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
 username = root
 password =
 system = mysql
diff --git a/tests/dibi/data/mysql.sql b/tests/dibi/data/mysql.sql
index 0fbd0204..63cc09ed 100644
--- a/tests/dibi/data/mysql.sql
+++ b/tests/dibi/data/mysql.sql
@@ -1,8 +1,7 @@
-DROP DATABASE IF EXISTS dibi_test;
-CREATE DATABASE dibi_test;
-USE dibi_test;
-
+DROP TABLE IF EXISTS `orders`;
 DROP TABLE IF EXISTS `products`;
+DROP TABLE IF EXISTS `customers`;
+
 CREATE TABLE `products` (
 	`product_id` int(11) NOT NULL AUTO_INCREMENT,
 	`title` varchar(100) NOT NULL,
@@ -15,7 +14,6 @@ INSERT INTO `products` (`product_id`, `title`) VALUES
 (3, 'Computer'),
 (2, 'Table');
 
-DROP TABLE IF EXISTS `customers`;
 CREATE TABLE `customers` (
 	`customer_id` int(11) NOT NULL AUTO_INCREMENT,
 	`name` varchar(100) NOT NULL,
@@ -30,7 +28,6 @@ INSERT INTO `customers` (`customer_id`, `name`) VALUES
 (5, 'Kryten'),
 (6, 'Kristine Kochanski');
 
-DROP TABLE IF EXISTS `orders`;
 CREATE TABLE `orders` (
 	`order_id` int(11) NOT NULL AUTO_INCREMENT,
 	`customer_id` int(11) NOT NULL,
diff --git a/tests/dibi/meta.phpt b/tests/dibi/meta.phpt
index 0c2515e2..d3a3796e 100644
--- a/tests/dibi/meta.phpt
+++ b/tests/dibi/meta.phpt
@@ -19,12 +19,11 @@ try {
 	Tester\Environment::skip($e->getMessage());
 }
 
-if ($config['system'] !== 'sqlsrv') {
-	Assert::same(3, count($meta->getTables()));
-	$names = $meta->getTableNames();
-	sort($names);
-	Assert::equal(['customers', 'orders', 'products'], $names);
-}
+$tableNames = $meta->getTableNames();
+Assert::true(in_array('customers', $tableNames, true));
+Assert::true(in_array('orders', $tableNames, true));
+Assert::true(in_array('products', $tableNames, true));
+
 
 Assert::false($meta->hasTable('xxxx'));
 
diff --git a/tests/dibi/mysql.time.phpt b/tests/dibi/mysql.time.phpt
index 5314b37c..c8b89e46 100644
--- a/tests/dibi/mysql.time.phpt
+++ b/tests/dibi/mysql.time.phpt
@@ -12,7 +12,6 @@ require __DIR__ . '/bootstrap.php';
 
 $conn = new Dibi\Connection($config);
 
-$conn->query('USE dibi_test');
 $conn->query('DROP TABLE IF EXISTS timetest');
 $conn->query('CREATE TABLE timetest (col TIME NOT NULL) ENGINE=InnoDB');
 $conn->query('INSERT INTO timetest VALUES ("12:30:40")');