diff --git a/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php b/tests/Feature/Database/DatabaseServiceProviderTest.php
similarity index 58%
rename from tests/Feature/Database/DatabaseServiceProviderConnectionTest.php
rename to tests/Feature/Database/DatabaseServiceProviderTest.php
index 636fba2e..d5fdd108 100644
--- a/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php
+++ b/tests/Feature/Database/DatabaseServiceProviderTest.php
@@ -5,21 +5,20 @@ namespace Engelsystem\Test\Feature\Database;
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
 use Engelsystem\Database\DatabaseServiceProvider;
-use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-class DatabaseServiceProviderConnectionTest extends TestCase
+class DatabaseServiceProviderTest extends DatabaseTest
 {
     /**
      * @covers \Engelsystem\Database\DatabaseServiceProvider::register()
      */
     public function testRegister()
     {
-        /** @var PHPUnit_Framework_MockObject_MockObject|Config $config */
+        /** @var MockObject|Config $config */
         $config = $this->getMockBuilder(Config::class)
             ->getMock();
 
-        /** @var PHPUnit_Framework_MockObject_MockObject|Application $app */
+        /** @var MockObject|Application $app */
         $app = $this->getMockBuilder(Application::class)
             ->setMethods(['get'])
             ->getMock();
@@ -38,16 +37,4 @@ class DatabaseServiceProviderConnectionTest extends TestCase
         $serviceProvider = new DatabaseServiceProvider($app);
         $serviceProvider->register();
     }
-
-    private function getDbConfig()
-    {
-        $configValues = require __DIR__ . '/../../../config/config.default.php';
-        $configFile = __DIR__ . '/../../../config/config.php';
-
-        if (file_exists($configFile)) {
-            $configValues = array_replace_recursive($configValues, require $configFile);
-        }
-
-        return $configValues['database'];
-    }
 }
diff --git a/tests/Feature/Database/DatabaseTest.php b/tests/Feature/Database/DatabaseTest.php
new file mode 100644
index 00000000..11df6779
--- /dev/null
+++ b/tests/Feature/Database/DatabaseTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Engelsystem\Test\Feature\Database;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class DatabaseTest extends TestCase
+{
+    /**
+     * Returns the database config
+     *
+     * @return string[]
+     */
+    protected function getDbConfig()
+    {
+        $configValues = require __DIR__ . '/../../../config/config.default.php';
+        $configFile = __DIR__ . '/../../../config/config.php';
+
+        if (file_exists($configFile)) {
+            $configValues = array_replace_recursive($configValues, require $configFile);
+        }
+
+        return $configValues['database'];
+    }
+}
diff --git a/tests/Unit/Database/DbTest.php b/tests/Unit/Database/DbTest.php
new file mode 100644
index 00000000..4529cd6b
--- /dev/null
+++ b/tests/Unit/Database/DbTest.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Database;
+
+use Engelsystem\Database\Db;
+use PDO;
+use PDOStatement;
+use PHPUnit\Framework\TestCase;
+use ReflectionObject;
+use Throwable;
+
+class DbTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Database\Db::connect()
+     */
+    public function testConnect()
+    {
+        $result = Db::connect('mysql:host=localhost;dbname=someTestDatabaseThatDoesNotExist;charset=utf8');
+        $this->assertFalse($result);
+
+        $result = Db::connect('sqlite::memory');
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::query()
+     */
+    public function testQuery()
+    {
+        $stm = Db::query('SELECT * FROM test_data');
+        $this->assertEquals('00000', $stm->errorCode());
+
+        $stm = Db::query('SELECT * FROM test_data WHERE id = ?', [4]);
+        $this->assertEquals('00000', $stm->errorCode());
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::unprepared()
+     */
+    public function testUnprepared()
+    {
+        $return = Db::unprepared('SELECT * FROM test_data WHERE id = 3');
+        $this->assertTrue($return);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::select()
+     */
+    public function testSelect()
+    {
+        $return = Db::select('SELECT * FROM test_data');
+        $this->assertTrue(count($return) > 3);
+
+        $return = Db::select('SELECT * FROM test_data WHERE id = ?', [2]);
+        $this->assertCount(1, $return);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::selectOne()
+     */
+    public function testSelectOne()
+    {
+        $return = Db::selectOne('SELECT * FROM test_data');
+        $this->assertEquals('Foo', $return['data']);
+
+        $return = Db::selectOne('SELECT * FROM test_data WHERE id = -1');
+        $this->assertEmpty($return);
+
+        $return = Db::selectOne('SELECT * FROM test_data WHERE id = ?', [3]);
+        $return = array_pop($return);
+        $this->assertTrue(!is_array($return));
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::insert()
+     */
+    public function testInsert()
+    {
+        $count = Db::insert("INSERT INTO test_data (id, data) VALUES (5, 'Some random text'), (6, 'another text')");
+        $this->assertEquals(2, $count);
+
+        $count = Db::insert('INSERT INTO test_data(id, data) VALUES (:id, :alias)', ['id' => 7, 'alias' => 'Blafoo']);
+        $this->assertEquals(1, $count);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::update()
+     */
+    public function testUpdate()
+    {
+        $count = Db::update("UPDATE test_data SET data='NOPE' WHERE data LIKE '%Replaceme%'");
+        $this->assertEquals(3, $count);
+
+        $count = Db::update("UPDATE test_data SET data=? WHERE data LIKE '%NOPE%'", ['Some random text!']);
+        $this->assertEquals(3, $count);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::delete()
+     */
+    public function testDelete()
+    {
+        $count = Db::delete('DELETE FROM test_data WHERE id=1');
+        $this->assertEquals(1, $count);
+
+        $count = Db::delete('DELETE FROM test_data WHERE data LIKE ?', ['%Replaceme%']);
+        $this->assertEquals(3, $count);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::statement()
+     */
+    public function testStatement()
+    {
+        $return = Db::statement('SELECT * FROM test_data WHERE id = 3');
+        $this->assertTrue($return);
+
+        $return = Db::statement('SELECT * FROM test_data WHERE id = ?', [2]);
+        $this->assertTrue($return);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::getError()
+     */
+    public function testGetError()
+    {
+        try {
+            Db::statement('foo');
+        } catch (Throwable $e) {
+        }
+
+        $error = Db::getError();
+        $this->assertTrue(is_array($error));
+        $this->assertEquals('near "foo": syntax error', $error[2]);
+
+        $db = new Db();
+        $refObject = new ReflectionObject($db);
+        $refProperty = $refObject->getProperty('stm');
+        $refProperty->setAccessible(true);
+        $refProperty->setValue(null, null);
+
+        $error = Db::getError();
+        $this->assertEquals([-1, null, null], $error);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::getPdo()
+     */
+    public function testGetPdo()
+    {
+        $pdo = Db::getPdo();
+        $this->assertInstanceOf(PDO::class, $pdo);
+    }
+
+    /**
+     * @covers \Engelsystem\Database\Db::getStm()
+     */
+    public function testGetStm()
+    {
+        $stm = Db::getStm();
+        $this->assertInstanceOf(PDOStatement::class, $stm);
+    }
+
+    /**
+     * Setup in memory database
+     */
+    protected function setUp()
+    {
+        Db::connect('sqlite::memory:');
+        Db::getPdo()->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        Db::query(
+            '
+            CREATE TABLE test_data(
+                id INT PRIMARY KEY NOT NULL,
+                data TEXT NOT NULL
+            );
+        ');
+        Db::query('CREATE UNIQUE INDEX test_data_id_uindex ON test_data (id);');
+        Db::insert("
+            INSERT INTO test_data (id, data)
+                VALUES
+                    (1, 'Foo'),
+                    (2, 'Bar'),
+                    (3, 'Batz'),
+                    (4, 'Lorem ipsum dolor sit'),
+                    (10, 'Replaceme ipsum dolor sit amet'),
+                    (11, 'Lorem Replaceme dolor sit amet'),
+                    (12, 'Lorem ipsum Replaceme sit amet')
+            ;");
+    }
+}