diff --git a/.gitignore b/.gitignore
index a16e58b..6136663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build
 composer.lock
 vendor
 .idea
+/tests/Performance/history.db
diff --git a/.travis.yml b/.travis.yml
index 79aa227..dc8faa0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ language: php
 php:
   - 7.0
   - 7.1
+  - hhvm
+  - nightly
 
 # This triggers builds to run on the new TravisCI infrastructure.
 # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
@@ -19,13 +21,59 @@ matrix:
     - php: 7.0
       env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
 
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgres
+
+before_install:
+  - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
+  - composer self-update
+
 before_script:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS tests_tmp;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests_tmp;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi"
+  - ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml
+  - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional
 
 script:
   - vendor/bin/phpcs --standard=psr2 src/
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
+jobs:
+  include:
+    - stage: test
+      env: DB=mariadb
+      addons:
+        mariadb: 10.1
+
+    - stage: test
+      env: DB=mysql MYSQL_VERSION=5.7
+      php: 7.1
+      before_script:
+        - ./tests/travis/install-mysql-$MYSQL_VERSION.sh
+      sudo: required
+
+    - stage: test
+      env: DB=mysql MYSQL_VERSION=5.7
+      php: nightly
+      before_script:
+        - ./tests/travis/install-mysql-$MYSQL_VERSION.sh
+      sudo: required
+
+    - stage: Benchmark
+      env: DB=none
+      before_script: wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey
+      script: php phpbench.phar run -l dots --report=default
+
+  allow_failures:
+    - php: nightly
+    - php: hhvm
+
 after_script:
   - |
     if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' && "$TRAVIS_PHP_VERSION" != '7.0' ]]; then
diff --git a/composer.json b/composer.json
index 683dd90..f9ffce1 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "League\\Database\\": "tests"
+            "League\\Database\\Tests\\": "tests/Tests",
+            "League\\Database\\Performance\\": "tests/Performance"
         }
     },
     "scripts": {
@@ -44,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.2.x-dev"
         }
     },
     "config": {
diff --git a/phpbench.json b/phpbench.json
new file mode 100644
index 0000000..e679f20
--- /dev/null
+++ b/phpbench.json
@@ -0,0 +1,15 @@
+{
+  "bootstrap": "vendor/autoload.php",
+  "path": "tests/Performance",
+
+  "extensions": [
+    "PhpBench\\Extensions\\Dbal\\DbalExtension",
+    "PhpBench\\Extensions\\XDebug\\XDebugExtension"
+  ],
+
+  "storage": "dbal",
+  "storage.dbal.connection": {
+    "driver": "pdo_sqlite",
+    "path": "tests/Performance/history.db"
+  }
+}
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 94d8494..2c58044 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,8 +10,8 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="thephpleague Test Suite">
-            <directory>tests</directory>
+        <testsuite name="Database Test Suite">
+            <directory>tests/Tests</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/Performance/.gitkeep b/tests/Performance/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Tests/ExampleTest.php b/tests/Tests/ExampleTest.php
index 1b2794b..03831cc 100644
--- a/tests/Tests/ExampleTest.php
+++ b/tests/Tests/ExampleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\Database;
+namespace League\Database\Tests;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..e69de29
diff --git a/tests/travis/install-mysql-5.7.sh b/tests/travis/install-mysql-5.7.sh
new file mode 100755
index 0000000..4954cc5
--- /dev/null
+++ b/tests/travis/install-mysql-5.7.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -ex
+
+echo "Installing MySQL 5.7..."
+
+sudo service mysql stop
+sudo apt-get remove "^mysql.*"
+sudo apt-get autoremove
+sudo apt-get autoclean
+echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
+wget http://dev.mysql.com/get/mysql-apt-config_0.8.6-1_all.deb
+sudo DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.6-1_all.deb
+sudo rm -rf /var/lib/apt/lists/*
+sudo apt-get clean
+sudo apt-get update -q
+sudo apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" mysql-server libmysqlclient-dev
+sudo mysql_upgrade
+
+echo "Restart mysql..."
+sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
diff --git a/tests/travis/mariadb.travis.xml b/tests/travis/mariadb.travis.xml
new file mode 100644
index 0000000..6185b06
--- /dev/null
+++ b/tests/travis/mariadb.travis.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../bootstrap.php"
+>
+    <php>
+        <env name="TYPE" value="mysql"/>
+        <env name="HOST" value="localhost" />
+        <env name="USERNAME" value="travis" />
+        <env name="PASSWORD" value="" />
+        <env name="DB_NAME" value="tests" />
+        <env name="DB_PORT" value="3306"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Database Test Suite">
+            <directory>./../Tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./../../src</directory>
+        </whitelist>
+    </filter>
+    <groups>
+        <exclude>
+            <group>performance</group>
+            <group>locking_functional</group>
+        </exclude>
+    </groups>
+
+</phpunit>
diff --git a/tests/travis/mysql.travis.xml b/tests/travis/mysql.travis.xml
new file mode 100644
index 0000000..7fc873e
--- /dev/null
+++ b/tests/travis/mysql.travis.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../bootstrap.php"
+>
+    <php>
+        <env name="TYPE" value="mysql"/>
+        <env name="HOST" value="localhost" />
+        <env name="USERNAME" value="travis" />
+        <env name="PASSWORD" value="" />
+        <env name="DB_NAME" value="tests" />
+        <env name="DB_PORT" value="3306"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Database Test Suite">
+            <directory>./../Tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./../../src</directory>
+        </whitelist>
+    </filter>
+    <groups>
+        <exclude>
+            <group>performance</group>
+            <group>locking_functional</group>
+        </exclude>
+    </groups>
+
+</phpunit>
\ No newline at end of file
diff --git a/tests/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml
new file mode 100644
index 0000000..72883e7
--- /dev/null
+++ b/tests/travis/pgsql.travis.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../bootstrap.php"
+>
+    <php>
+        <env name="TYPE" value="pgsql"/>
+        <env name="HOST" value="localhost" />
+        <env name="USERNAME" value="postgres" />
+        <env name="PASSWORD" value="" />
+        <env name="DB_NAME" value="tests" />
+        <env name="DB_PORT" value="5432"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Database Test Suite">
+            <directory>./../Tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./../../src</directory>
+        </whitelist>
+    </filter>
+    <groups>
+        <exclude>
+            <group>performance</group>
+            <group>locking_functional</group>
+        </exclude>
+    </groups>
+
+</phpunit>
\ No newline at end of file
diff --git a/tests/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml
new file mode 100644
index 0000000..6cd3f84
--- /dev/null
+++ b/tests/travis/sqlite.travis.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         verbose="true"
+         failOnRisky="true"
+         bootstrap="../bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="Database Test Suite">
+            <directory>./../Tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./../../src</directory>
+        </whitelist>
+    </filter>
+    <groups>
+        <exclude>
+            <group>performance</group>
+            <group>locking_functional</group>
+        </exclude>
+    </groups>
+
+</phpunit>
\ No newline at end of file