diff --git a/phpBB/common.php b/phpBB/common.php
index c48418276a..132b95c1fe 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -72,8 +72,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 3f14a9cb82..2baa9d6c8a 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -38,8 +38,6 @@ if (isset($_GET['avatar']))
 		exit;
 	}
 
-	require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 	require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 	require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 	require($phpbb_root_path . 'includes/constants.' . $phpEx);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1c8fe1ef9..843e8c2f23 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -82,8 +82,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7e150c2519..9d003ba6ab 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -69,8 +69,6 @@ else
 }
 @ini_set('memory_limit', $mem_limit);
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3544c66c3d..302701e3b3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -12,8 +12,6 @@ $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
 require_once $phpbb_root_path . 'includes/startup.php';
 
-require_once $phpbb_root_path . 'vendor/.composer/autoload.php';
-
 $table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
 require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;