diff --git a/.travis.yml b/.travis.yml
index 7dcfdfc..8b63dea 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - '5.6'
   - '7.0'
   - '7.1'
+  - '7.2'
 script:
   - vendor/bin/phpunit
 install:
diff --git a/composer.json b/composer.json
index 3edac2c..b0f8a7a 100755
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,16 @@
         "php": ">=5.6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7|^6.5"
     },
     "autoload": {
         "psr-4": {
             "DbTools\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "DbTools\\Tests\\": "tests/"
+        }
     }
 }
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index c7f13ae..23bef39 100755
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace DbTools\Tests;
+
 use DbTools\Database;
+use PDO;
+use PHPUnit\Framework\TestCase;
 
-class DatabaseTest extends PHPUnit_Framework_TestCase
+class DatabaseTest extends TestCase
 {
 	public function testSetConfig()
 	{
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
index ac3dedf..cfaf9eb 100755
--- a/tests/ModelTest.php
+++ b/tests/ModelTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace DbTools\Tests;
+
 use DbTools\Model;
+use stdClass;
+use PHPUnit\Framework\TestCase;
 
-class ModelTest extends PHPUnit_Framework_TestCase
+class ModelTest extends TestCase
 {
 	public function testConstructorAndGet()
 	{
diff --git a/tests/PagerTest.php b/tests/PagerTest.php
index b14de00..e2515e3 100755
--- a/tests/PagerTest.php
+++ b/tests/PagerTest.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace DbTools\Tests;
+
 use DbTools\Pager;
 use DbTools\Database;
+use stdClass;
+use PHPUnit\Framework\TestCase;
 
-class PagerTest extends PHPUnit_Framework_TestCase
+class PagerTest extends TestCase
 {
 
 	public function invalidPageValues()
diff --git a/tests/RestResourceTest.php b/tests/RestResourceTest.php
index 4255fef..a14e411 100755
--- a/tests/RestResourceTest.php
+++ b/tests/RestResourceTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace DbTools\Tests;
+
 use DbTools\RestResource;
+use PHPUnit\Framework\TestCase;
 
 class TestRestResource extends RestResource
 {
@@ -24,7 +27,7 @@ public function formatEntity($entity)
 	}
 }
 
-class RestResourceTest extends PHPUnit_Framework_TestCase
+class RestResourceTest extends TestCase
 {
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -71,11 +74,10 @@ public function testValidSort($sort, $sql)
 		$test->processRequest([
 			'sort' => $sort
 		]);
-		if ( $sql ) {
-			$opt = $test->getModelFilters();
-			$this->assertArrayHasKey('order_by', $opt);
-			$this->assertEquals($sql, $opt['order_by']);
-		}
+		
+		$opt = $test->getModelFilters();
+		$this->assertArrayHasKey('order_by', $opt);
+		$this->assertEquals($sql, $opt['order_by']);
 	}
 
 	/**
diff --git a/tests/TableModelTest.php b/tests/TableModelTest.php
index 4b9b4a2..2c83087 100755
--- a/tests/TableModelTest.php
+++ b/tests/TableModelTest.php
@@ -1,7 +1,14 @@
 <?php
 
+namespace DbTools\Tests;
+
 use DbTools\TableModel;
 use DbTools\Database;
+use ReflectionMethod;
+use DateTime;
+use DateTimeZone;
+use stdClass;
+use PHPUnit\Framework\TestCase;
 
 class ConcreteTableModel extends TableModel
 {
@@ -42,7 +49,7 @@ static protected function afterGetBy($dbh, array $opt, & $obj)
 	}
 }
 
-class TableModelTest extends PHPUnit_Framework_TestCase
+class TableModelTest extends TestCase
 {
 	static protected $id;
 
@@ -114,7 +121,7 @@ public function testLimit()
 	public function testGetBy()
 	{
 		$obj = ConcreteTableModel::getById(self::$id);
-		$this->assertInstanceOf('ConcreteTableModel', $obj);
+		$this->assertInstanceOf(ConcreteTableModel::class, $obj);
 		$this->assertNotEmpty(ConcreteTableModel::getLastSelectQuery());
 	}