diff --git a/.travis.yml b/.travis.yml
index 895be8053..7fec1e90f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,24 +18,21 @@ before_install:
 install:
   - mysql -uroot -e 'create database test_mysql;'
   - cd bin
-  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS="dynamic" -DSERVERS=1 -DNOJEM=1 -DWITH_DYNAMIC_LINKING=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install
+  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=0 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install
   - cd ..
-  - chmod +x contrib/check_updates.sh
 
 script:
   - $CXX --version
-  - mysql -uroot < sql/create/create_mysql.sql
-  - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql
-  - ./contrib/check_updates.sh auth 6.x auth
-  - mysql -utrinity -ptrinity characters < sql/base/characters_database.sql
-  - ./contrib/check_updates.sh characters 6.x characters
-  - mysql -utrinity -ptrinity world < sql/base/dev/world_database.sql
-  - mysql -utrinity -ptrinity hotfixes < sql/base/dev/hotfixes_database.sql
-  - cat sql/updates/world/6.x/*.sql | mysql -utrinity -ptrinity world
-  - cat sql/updates/hotfixes/6.x/*.sql | mysql -utrinity -ptrinity hotfixes
-  - mysql -uroot < sql/create/drop_mysql.sql
+  - mysql -uroot < data/sql/create/create_mysql.sql
+  - cat data/sql/base/db_auth/*.sql | mysql -uacore -pacore auth
+  - cat data/sql/base/db_characters/*.sql | mysql -uacore -pacore characters
+  - cat data/sql/base/db_world/*.sql | mysql -uacore -pacore world
+  - cat data/sql/updates/db_auth/*.sql | mysql -utrinity -ptrinity auth
+  - cat data/sql/updates/db_characters/*.sql | mysql -utrinity -ptrinity characters
+  - cat data/sql/updates/db_world/*.sql | mysql -utrinity -ptrinity world
+  - mysql -uroot < data/sql/create/drop_mysql.sql
   - cd bin
   - make -j 8 -k && make install
   - cd check_install/bin
-  - ./bnetserver --version
+  - ./authserver --version
   - ./worldserver --version
diff --git a/data/sql/create/create_mysql.sql b/data/sql/create/create_mysql.sql
new file mode 100644
index 000000000..8d2e47cb4
--- /dev/null
+++ b/data/sql/create/create_mysql.sql
@@ -0,0 +1,13 @@
+GRANT USAGE ON * . * TO 'acore'@'localhost' IDENTIFIED BY 'acore' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
+
+CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+GRANT ALL PRIVILEGES ON `world` . * TO 'acore'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `characters` . * TO 'acore'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `auth` . * TO 'acore'@'localhost' WITH GRANT OPTION;
\ No newline at end of file
diff --git a/data/sql/create/drop_mysql.sql b/data/sql/create/drop_mysql.sql
new file mode 100644
index 000000000..90f33cb01
--- /dev/null
+++ b/data/sql/create/drop_mysql.sql
@@ -0,0 +1,21 @@
+REVOKE ALL PRIVILEGES ON * . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `world` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `world` . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `characters` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `characters` . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `auth` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `auth` . * FROM 'acore'@'localhost';
+
+DROP USER 'acore'@'localhost';
+
+DROP DATABASE IF EXISTS `world`;
+
+DROP DATABASE IF EXISTS `characters`;
+
+DROP DATABASE IF EXISTS `auth`;