diff --git a/composer.json b/composer.json
index 9d8138c..cd10fe9 100644
--- a/composer.json
+++ b/composer.json
@@ -26,5 +26,15 @@
             "Dframe\\Database\\": "src/"
         }
     },
-    "require": {}
-}
\ No newline at end of file
+    "autoload-dev": {
+        "psr-4": {
+            "Dframe\\Database\\tests\\": "tests/"
+        }
+    },
+    "require": {
+        "php": ">=5.6"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7 || ^6.5"
+    }
+}
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index b3efd23..81d5294 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -5,6 +5,3 @@
 
 # Application configuration
 define('APP_DIR', dirname(__FILE__) . '/app/');
-
-$autoloader = include dirname(__FILE__) . '/../vendor/autoload.php';;
-$autoloader->addPsr4('Dframe\Database\tests\\', __DIR__);
\ No newline at end of file
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 5a67ca0..9d938bd 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -1,14 +1,11 @@
 <?php
-use PHPUnit_Framework_Constraint_IsType as PHPUnit_IsType;
+namespace Dframe\Database\tests;
 
+use PHPUnit\Framework\Constraint\IsType as PHPUnitIsType;
 use Dframe\Database\Database;
 use Dframe\Database\Pdohelper;
 use \PDO;
 
-// backward compatibility
-if (!class_exists('\PHPUnit\Framework\TestCase') and class_exists('\PHPUnit_Framework_TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
 //@Todo
 //@Todo
 
@@ -50,12 +47,10 @@ public function getConnection()
 
     public function testEmptyPdoQuery()
     {
-        try {
-            $test = $this->getConnection()->pdoQuery();
-        } catch (Exception $e) {
-            $this->assertEquals($e->getMessage(), 'SQLSTATE[42000]: Syntax error or access violation: 1065 Query was empty');
-        }
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('SQLSTATE[42000]: Syntax error or access violation: 1065 Query was empty');
 
+        $test = $this->getConnection()->pdoQuery();
     }
 
 }
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
index 8f7fb08..7f537f5 100644
--- a/tests/QueryTest.php
+++ b/tests/QueryTest.php
@@ -1,13 +1,13 @@
 <?php
 namespace Dframe\Database\tests;
 
-use PHPUnit_Framework_Constraint_IsType as PHPUnit_IsType;
+use PHPUnit\Framework\Constraint\IsType as PHPUnitIsType;
 
 use Dframe\Database\Database;
 use Dframe\Database\Pdohelper;
 
 
-class QueryTest extends \Dframe\Database\tests\TestSetUp
+class QueryTest extends TestSetUp
 {
     public function setUp()
     {
diff --git a/tests/TestSetUp.php b/tests/TestSetUp.php
index f033ae2..dadfeb3 100644
--- a/tests/TestSetUp.php
+++ b/tests/TestSetUp.php
@@ -2,13 +2,9 @@
 namespace Dframe\Database\tests;
 
 use Dframe\Database\Database;
+use PHPUnit\Framework\TestCase;
 
-// backward compatibility
-if (!class_exists('\PHPUnit\Framework\TestCase') and class_exists('\PHPUnit_Framework_TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
-
-abstract class TestSetUp extends \PHPUnit\Framework\TestCase
+abstract class TestSetUp extends TestCase
 {
 
     public function getConnection()