diff --git a/admin/admin-cli.php b/admin/admin-cli.php
index d23da2697d..87bed6fa92 100755
--- a/admin/admin-cli.php
+++ b/admin/admin-cli.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -qC
+#!/usr/bin/env php
 <?php
 /**
  * Admin - Command line interface
diff --git a/doc/check_namespace.php b/doc/check_namespace.php
index c42a3d1d08..d86639ec2c 100755
--- a/doc/check_namespace.php
+++ b/doc/check_namespace.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php -qC
+#!/usr/bin/env php
 <?php
 /**
  * EGroupware - check namespace usage in converted code
diff --git a/doc/fix_api.php b/doc/fix_api.php
index 86b6c7227a..70d67c490e 100755
--- a/doc/fix_api.php
+++ b/doc/fix_api.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php -qC
+#!/usr/bin/env php
 <?php
 /**
  * EGroupware - check namespace usage in converted code
diff --git a/doc/test-cli.php b/doc/test-cli.php
index f196bf8750..162e9ef1de 100755
--- a/doc/test-cli.php
+++ b/doc/test-cli.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php -dapc.enable_cli=1
+#!/usr/bin/env php
 <?php
 /**
  * EGroupware Test Runner
@@ -12,7 +12,9 @@ if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-pag
 	die('<h1>test-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
 
-require_once './api/src/loader/common.php';
+ini_set('apc.enable_cli', true);
+
+require_once dirname(__DIR__).'/api/src/loader/common.php';
 
 $_SERVER['argv'][] = '--verbose';
 $_SERVER['argv'][] = 'EgroupwareTestRunner';
diff --git a/filemanager/cli.php b/filemanager/cli.php
index aa37b1b32e..977c3e519a 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -qC
+#!/usr/bin/env php
 <?php
 /**
  * EGroupware Filemanager - Command line interface
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 376be6da42..87baa8ac61 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php -qC
+#!/usr/bin/env php
 <?php
 /**
  * Setup - Command line interface