diff --git a/.travis.yml b/.travis.yml
index bb6c4423d..af80f3572 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,8 @@ matrix:
     - php: nightly
     - php: hhvm
 
+before_script:
+  - composer install
+
 script:
   - php -dshort_open_tag=Off -dmagic_quotes_gpc=Off tests/index.php
diff --git a/composer.json b/composer.json
index 440a405b9..de07bf918 100644
--- a/composer.json
+++ b/composer.json
@@ -15,5 +15,8 @@
     },
     "autoload": {
         "psr-0": { "Doctrine_": "lib/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "": "tests/autoloaded/" }
     }
 }
diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php
index 957c51478..6cb974f4e 100644
--- a/lib/Doctrine/Manager.php
+++ b/lib/Doctrine/Manager.php
@@ -552,9 +552,7 @@ public function bindComponent($componentName, $connectionName)
      */
     public function getConnectionForComponent($componentName)
     {
-        Doctrine_Core::modelsAutoload($componentName);
-
-        if (isset($this->_bound[$componentName])) {
+        if ($this->hasConnectionForComponent($componentName)) {
             return $this->getConnection($this->_bound[$componentName]);
         }
 
@@ -569,6 +567,10 @@ public function getConnectionForComponent($componentName)
      */
     public function hasConnectionForComponent($componentName = null)
     {
+        if (!Doctrine_Core::modelsAutoload($componentName)) {
+            class_exists($componentName); // Trigger autoloader to bind connection.
+        }
+
         return isset($this->_bound[$componentName]);
     }
 
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
index 6a6595cd4..a98248849 100644
--- a/tests/BaseTestCase.php
+++ b/tests/BaseTestCase.php
@@ -78,6 +78,45 @@ public function testAllModelsAvailable()
         $this->assertTrue( class_exists('BaseConservativeModelLoadingUser', true));
     }
 
+    public function testCreateTableBindConnection()
+    {
+        Doctrine_Manager::getInstance()->openConnection('sqlite::memory:', 'test_bind_connection', false);
+
+        $table = Doctrine_Core::getTable('ModelBindConnection');
+        $this->assertEqual('test_bind_connection', $table->getConnection()->getName());
+    }
+
+    public function testCreateQueryBindConnection()
+    {
+        $manager = Doctrine_Manager::getInstance();
+        $currentConnection = $manager->getCurrentConnection();
+        $connection = $manager->openConnection('sqlite::memory:', 'test_bind_connection', false);
+
+        $query = Doctrine_Core::getTable('ModelBindConnection')->createQuery();
+
+        $refl = new ReflectionProperty($query, '_passedConn');
+        $refl->setAccessible(true);
+        $isPassedConn = $refl->getValue($query);
+        $refl->setAccessible(false);
+
+        // Assert that the connedtion of the query is not passed.
+        $this->assertFalse($isPassedConn);
+
+        $query->getSqlQuery();
+
+        // Assert that the current connection was not changed.
+        $this->assertTrue($currentConnection === $manager->getCurrentConnection());
+
+        // Assert that the model does not exists on the current connection.
+        $this->assertFalse($currentConnection->hasTable('ModelBindConnection'));
+
+        // Assert that the model does not exists on the bound connection.
+        $this->assertTrue($connection->hasTable('ModelBindConnection'));
+
+        // Assert that the connection of the query is the bound connection.
+        $this->assertEqual('test_bind_connection', $query->getConnection()->getName());
+    }
+
     public function testModelLoadingCacheInformation()
     {
         $models = Doctrine_Core::getLoadedModels();
diff --git a/tests/autoloaded/ModelBindConnection.php b/tests/autoloaded/ModelBindConnection.php
new file mode 100644
index 000000000..496e710b3
--- /dev/null
+++ b/tests/autoloaded/ModelBindConnection.php
@@ -0,0 +1,11 @@
+<?php
+
+Doctrine_Manager::getInstance()->bindComponent('ModelBindConnection', 'test_bind_connection');
+
+class ModelBindConnection extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 1);
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 2bb1704da..04096bb71 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -12,7 +12,7 @@
 
 define('DOCTRINE_DIR', $_SERVER['DOCTRINE_DIR']);
 
-require_once(DOCTRINE_DIR . '/lib/Doctrine/Core.php');
+require_once DOCTRINE_DIR.'/vendor/autoload.php';
 
 spl_autoload_register(array('Doctrine_Core', 'autoload'));
 spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));