diff --git a/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php b/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
index 7d2660fd6..58ecbef9c 100755
--- a/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
+++ b/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
@@ -1,13 +1,21 @@
 <?php
 
 namespace Tests\Icinga\Protocol\Livestatus;
+
+use Icinga\Protocol\Livestatus\Connection;
+use Icinga\Protocol\Livestatus\Query;
+use PHPUnit_Framework_TestCase as TestCase;
+
+require_once('../../library/Icinga/Protocol/AbstractQuery.php');
+require_once('../../library/Icinga/Protocol/Livestatus/Connection.php');
+require_once('../../library/Icinga/Protocol/Livestatus/Query.php');
+
 /**
 *
 * Test class for Connection 
-* Created Wed, 16 Jan 2013 15:15:16 +0000 
 *
 **/
-class ConnectionTest extends \PHPUnit_Framework_TestCase
+class ConnectionTest extends TestCase
 {
 
     /**
@@ -25,7 +33,10 @@ class ConnectionTest extends \PHPUnit_Framework_TestCase
     **/
     public function testSelect()
     {
-        $this->markTestIncomplete('testSelect is not implemented yet');
+        $socket = tempnam(sys_get_temp_dir(), 'IcingaTest');
+        $connection = new Connection($socket);
+        $this->assertTrue($connection->select() instanceof Query);
+        unlink($socket);
     }
 
     /**
diff --git a/test/php/library/Icinga/Protocol/Livestatus/QueryTest.php b/test/php/library/Icinga/Protocol/Livestatus/QueryTest.php
index 2df606b2a..020396ebc 100755
--- a/test/php/library/Icinga/Protocol/Livestatus/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Livestatus/QueryTest.php
@@ -1,13 +1,22 @@
 <?php
 
 namespace Tests\Icinga\Protocol\Livestatus;
+
+use Icinga\Protocol\Livestatus\Connection;
+use Icinga\Protocol\Livestatus\Query;
+use PHPUnit_Framework_TestCase as TestCase;
+
+require_once('../../library/Icinga/Protocol/AbstractQuery.php');
+require_once('../../library/Icinga/Protocol/Livestatus/Query.php');
+require_once('../../library/Icinga/Protocol/Livestatus/Connection.php');
+
+
 /**
 *
 * Test class for Query 
-* Created Wed, 16 Jan 2013 15:15:16 +0000 
 *
 **/
-class QueryTest extends \PHPUnit_Framework_TestCase
+class QueryTest extends TestCase
 {
 
     /**