diff --git a/test/php/library/Director/IcingaConfig/AssignRendererTest.php b/test/php/library/Director/IcingaConfig/AssignRendererTest.php
index b54f6378..70aa45c1 100644
--- a/test/php/library/Director/IcingaConfig/AssignRendererTest.php
+++ b/test/php/library/Director/IcingaConfig/AssignRendererTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Icinga\Modules\Director;
+namespace Tests\Icinga\Module\Director\IcingaConfig;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Director\IcingaConfig\AssignRenderer;
diff --git a/test/php/library/Director/Objects/IcingaHostTest.php b/test/php/library/Director/Objects/IcingaHostTest.php
index 3a3a05e9..ea39a695 100644
--- a/test/php/library/Director/Objects/IcingaHostTest.php
+++ b/test/php/library/Director/Objects/IcingaHostTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Icinga\Modules\Director\Objects;
+namespace Tests\Icinga\Module\Director\Objects;
 
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Test\BaseTestCase;
@@ -102,6 +102,10 @@ class IcingaHostTest extends BaseTestCase
 
     public function testWhetherHostVarsArePersisted()
     {
+        if ($this->skipForMissingDb()) {
+            return;
+        }
+
         $db = $this->getDb();
         $this->host()->store($db);
         $host = IcingaHost::load($this->testHostName, $db);
@@ -166,9 +170,11 @@ class IcingaHostTest extends BaseTestCase
 
     public function tearDown()
     {
-        $db = $this->getDb();
-        if (IcingaHost::exists($this->testHostName, $db)) {
-            IcingaHost::load($this->testHostName, $db)->delete();
+        if ($this->hasDb()) {
+            $db = $this->getDb();
+            if (IcingaHost::exists($this->testHostName, $db)) {
+                IcingaHost::load($this->testHostName, $db)->delete();
+            }
         }
     }
 }
diff --git a/test/php/library/Director/Objects/IcingaTimePeriodRangesTest.php b/test/php/library/Director/Objects/IcingaTimePeriodRangesTest.php
index 37ed0ff7..a62bc77b 100644
--- a/test/php/library/Director/Objects/IcingaTimePeriodRangesTest.php
+++ b/test/php/library/Director/Objects/IcingaTimePeriodRangesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Icinga\Modules\Director\Objects;
+namespace Tests\Icinga\Module\Director\Objects;
 
 use Icinga\Module\Director\Objects\IcingaTimePeriodRange;
 use Icinga\Module\Director\Objects\IcingaTimePeriodRanges;
@@ -13,6 +13,10 @@ class IcingaTimePeriodRangesTest extends BaseTestCase
 
     public function testWhetherUpdatedTimeperiodRangesAreCorrectlyStored()
     {
+        if ($this->skipForMissingDb()) {
+            return;
+        }
+
         $period = $this->createTestPeriod();
 
         $newRanges = array(