diff --git a/.gitignore b/.gitignore
index a7b2c6b1c..ef44d81c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 !.gitkeep
 
 build/
-test/js/npm-debug.log
 
 # ./configure output
 config.log
@@ -20,10 +19,9 @@ config.status
 Makefile
 
 # cmd tester
-test/php/bin/extcmd_test
+modules/test/bin/extcmd_test
 
 # misc test output
-test/frontend/static/public
 test/php/library/Icinga/Protocol/Statusdat/.cache
 
 # Generated API documentation
diff --git a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
index b65e202c6..0ec9a4da6 100644
--- a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
+++ b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
@@ -30,6 +30,14 @@ if (!defined('EXTCMD_TEST_BIN')) {
  */
 class CommandPipeTest extends BaseTestCase
 {
+    public function setUp()
+    {
+        parent::setUp();
+        if (! file_exists(EXTCMD_TEST_BIN)) {
+            $this->markTestSkipped('Cannot find "' . EXTCMD_TEST_BIN . '"');
+        }
+    }
+
     /**
      * Return the path of the test pipe used in these tests
      *