diff --git a/pickles.php b/pickles.php
index 882066c..c1ab13d 100644
--- a/pickles.php
+++ b/pickles.php
@@ -124,7 +124,7 @@ $config = Config::getInstance();
 $config->data['pickles']['path'] = dirname(__FILE__) . '/';
 
 // Requires the Composer autoloader
-require_once $config->pickles['path'] . 'vendor/composer/autoload.php';
+require_once $config->pickles['path'] . 'vendor/autoload.php';
 
 // Configures any available PHP configuration options
 if (is_array($config->php) && count($config->php))
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 8fc2639..882ea32 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -13,7 +13,7 @@ set_exit_overload(function($status = false)
 ob_start();
 @session_start();
 
-require_once 'vendor/composer/autoload.php';
+require_once 'vendor/autoload.php';
 
 $root = org\bovigo\vfs\vfsStream::setup('site');