diff --git a/installer/index.php b/installer/index.php
index 83c311fca6..eb3a9b0339 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -140,9 +140,9 @@
 <ol id="progress">
 <?php
 $include_steps = [
-    1 => './check.php',
-    2 => './config.php',
-    3 => './test.php',
+    1 => __DIR__ . '/check.php',
+    2 => __DIR__ . '/config.php',
+    3 => __DIR__ . '/test.php',
 ];
 
 if (!in_array($RCI->step, array_keys($include_steps))) {
diff --git a/plugins/password/drivers/tinycp.php b/plugins/password/drivers/tinycp.php
index 7e1fff7995..b1f1c2d00b 100644
--- a/plugins/password/drivers/tinycp.php
+++ b/plugins/password/drivers/tinycp.php
@@ -30,7 +30,7 @@ class rcube_tinycp_password
 {
     public function save($currpass, $newpass, $username)
     {
-        require_once 'TinyCPConnector.php';
+        require_once __DIR__ . '/TinyCPConnector.php';
 
         $tinycp_host   = rcmail::get_instance()->config->get('password_tinycp_host');
         $tinycp_port   = rcmail::get_instance()->config->get('password_tinycp_port');