diff --git a/.travis.yml b/.travis.yml
index 7f1219dbf..b1ff6fc6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,7 @@ script:
   # Switch back to 'blt' directory.
   - cd ../blt
   # Run 'blt' phpunit tests, excluding deploy-push tests.
-  - phpunit tests/phpunit --exclude-group deploy-push
+  - phpunit tests/phpunit --group blt --exclude-group deploy-push
 
 deploy:
   provider: script
diff --git a/composer.json b/composer.json
index e2303829e..644d96d8f 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,10 @@
     "symfony/console":                  "~2"
   },
   "autoload": {
-    "psr-4": {"Acquia\\Blt\\": "src/"}
+    "psr-4": {
+      "Acquia\\Blt\\": "src/",
+      "Acquia\\Blt\\Tests\\": "tests/phpunit/src/"
+    }
   },
   "bin": [
     "bin/blt",
diff --git a/phing/tasks/tests.xml b/phing/tasks/tests.xml
index 01131321e..c05f44b18 100644
--- a/phing/tasks/tests.xml
+++ b/phing/tasks/tests.xml
@@ -88,6 +88,7 @@
         <fileset dir="${repo.root}/tests/phpunit">
           <include name="**/*Test*.php"/>
         </fileset>
+        <fileset dir="${blt.root}/tests/phpunit/BltProject"/>
       </batchtest>
     </phpunit>
     <phpunitreport infile="${reports.localDir}/phpunit/testsuites.xml" format="noframes" todir="${reports.localDir}/phpunit" />
diff --git a/template/drush.wrapper b/template/drush.wrapper
index 113b38334..727d29c17 100755
--- a/template/drush.wrapper
+++ b/template/drush.wrapper
@@ -45,7 +45,7 @@ fi
 
 DOCROOT=$(${DIR}/vendor/bin/blt echo-property -Dproperty.name=drush.root -S -e)
 if [ -z "$DOCROOT" ]; then
-  vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@"
+  vendor/bin/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases "$@"
 else
-  vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@" -r $DOCROOT
+  vendor/bin/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases "$@" -r $DOCROOT
 fi
diff --git a/template/tests/phpunit/src/TestBase.php b/template/tests/phpunit/src/TestBase.php
deleted file mode 100644
index a0da3cabe..000000000
--- a/template/tests/phpunit/src/TestBase.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\Tests\PHPUnit;
-
-use Symfony\Component\Yaml\Yaml;
-
-/**
- * Class TestBase.
- *
- * Verifies that behat configuration is as expected.
- */
-abstract class TestBase extends \PHPUnit_Framework_TestCase {
-
-  protected $projectDirectory;
-  protected $drupalRoot;
-  protected $config;
-
-  /**
-   * Class constructor.
-   */
-  public function __construct($name = NULL, array $data = array(), $data_name = '') {
-
-    parent::__construct($name, $data, $data_name);
-    $this->projectDirectory = dirname(dirname(dirname(__DIR__)));
-    $this->drupalRoot = $this->projectDirectory . '/docroot';
-    $this->config = Yaml::parse(file_get_contents("{$this->projectDirectory}/project.yml"));
-    if (file_exists("{$this->projectDirectory}/project.local.yml")) {
-      $this->config = array_replace_recursive($this->config, Yaml::parse(file_get_contents("{$this->projectDirectory}/project.local.yml")));
-    }
-  }
-
-}
diff --git a/tests/phpunit/BltTest.php b/tests/phpunit/Blt/BltTest.php
similarity index 67%
rename from tests/phpunit/BltTest.php
rename to tests/phpunit/Blt/BltTest.php
index a74e753da..acf7e7d8b 100644
--- a/tests/phpunit/BltTest.php
+++ b/tests/phpunit/Blt/BltTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal;
+namespace Acquia\Blt\Tests\Blt;
 
-use Symfony\Component\Yaml\Yaml;
+use Acquia\Blt\Tests\BltTestBase;
 
 /**
  * Class BLTTest.
@@ -10,19 +10,12 @@
  * Verifies that project structure and configuration matches BLT
  * standards.
  */
-class BltTest extends \PHPUnit_Framework_TestCase {
-
-  /**
-   * Class constructor.
-   */
-  public function __construct() {
-    $this->projectDirectory = realpath(dirname(__FILE__) . '/../../');
-    $this->newProjectDir = dirname($this->projectDirectory) . '/blt-project';
-    $this->config = Yaml::parse(file_get_contents("{$this->newProjectDir}/project.yml"));
-  }
+class BltTest extends BltTestBase {
 
   /**
    * Tests Phing pt:create target.
+   *
+   * @group blt
    */
   public function testBltCreate() {
 
diff --git a/tests/phpunit/DeployTest.php b/tests/phpunit/Blt/DeployTest.php
similarity index 87%
rename from tests/phpunit/DeployTest.php
rename to tests/phpunit/Blt/DeployTest.php
index d0bd801d3..7a81da404 100644
--- a/tests/phpunit/DeployTest.php
+++ b/tests/phpunit/Blt/DeployTest.php
@@ -1,24 +1,21 @@
 <?php
 
-namespace Drupal;
+namespace Acquia\Blt\Tests\Blt;
 
-use Symfony\Component\Yaml\Yaml;
+use Acquia\Blt\Tests\BltTestBase;
 
 /**
  * Class DeployTest.
  *
  * Verifies that build artifact matches standards.
  */
-class DeployTest extends \PHPUnit_Framework_TestCase {
+class DeployTest extends BltTestBase {
 
   /**
-   * Class constructor.
+   * {@inheritdoc}
    */
-  public function __construct() {
-
-    $this->projectDirectory = realpath(dirname(__FILE__) . '/../../');
-    $this->newProjectDir = dirname($this->projectDirectory) . '/blt-project';
-    $this->config = Yaml::parse(file_get_contents("{$this->newProjectDir}/project.yml"));
+  public function setUp() {
+    parent::setUp();
     $this->deploy_dir = $this->newProjectDir . '/deploy';
   }
 
@@ -26,6 +23,7 @@ public function __construct() {
    * Tests Phing deploy:build:all target.
    *
    * @group deploy
+   * @group blt
    */
   public function testBltDeployBuild() {
 
@@ -63,6 +61,7 @@ public function testBltDeployBuild() {
    *
    * @group deploy
    * @group deploy-push
+   * @group blt
    */
   public function testBltDeployPush() {
 
diff --git a/tests/phpunit/DrupalVmTest.php b/tests/phpunit/Blt/DrupalVmTest.php
similarity index 65%
rename from tests/phpunit/DrupalVmTest.php
rename to tests/phpunit/Blt/DrupalVmTest.php
index fd3e40df4..1b6cc9a39 100644
--- a/tests/phpunit/DrupalVmTest.php
+++ b/tests/phpunit/Blt/DrupalVmTest.php
@@ -1,27 +1,20 @@
 <?php
 
-namespace Drupal;
+namespace Acquia\Blt\Tests\Blt;
 
-use Symfony\Component\Yaml\Yaml;
+use Acquia\Blt\Tests\BltTestBase;
 
 /**
  * Class DrupalVM.
  *
  * Verifies that Drupal VM integration works as expected.
  */
-class DrupalVmTest extends \PHPUnit_Framework_TestCase {
-
-  /**
-   * Class constructor.
-   */
-  public function __construct() {
-    $this->projectDirectory = realpath(dirname(__FILE__) . '/../../');
-    $this->newProjectDir = dirname($this->projectDirectory) . '/blt-project';
-    $this->config = Yaml::parse(file_get_contents("{$this->newProjectDir}/project.yml"));
-  }
+class DrupalVmTest extends BltTestBase {
 
   /**
    * Tests Phing vm:init target.
+   *
+   * @group blt
    */
   public function testVmInit() {
     $this->assertFileExists($this->newProjectDir . '/Vagrantfile');
diff --git a/template/tests/phpunit/Bolt/BehatTest.php b/tests/phpunit/BltProject/BehatTest.php
similarity index 75%
rename from template/tests/phpunit/Bolt/BehatTest.php
rename to tests/phpunit/BltProject/BehatTest.php
index 488951cd7..52f2742af 100644
--- a/template/tests/phpunit/Bolt/BehatTest.php
+++ b/tests/phpunit/BltProject/BehatTest.php
@@ -1,16 +1,20 @@
 <?php
 
-namespace Drupal\Tests\PHPUnit;
+namespace Acquia\Blt\Tests\BltProject;
+
+use Acquia\Blt\Tests\BltProjectTestBase;
 
 /**
  * Class BehatTest.
  *
  * Verifies that behat configuration is as expected.
  */
-class BehatTest extends TestBase {
+class BehatTest extends BltProjectTestBase {
 
   /**
    * Tests Phing setup:behat target.
+   *
+   * @group blt-project
    */
   public function testSetupBehat() {
 
diff --git a/template/tests/phpunit/Bolt/BuildTest.php b/tests/phpunit/BltProject/BuildTest.php
similarity index 74%
rename from template/tests/phpunit/Bolt/BuildTest.php
rename to tests/phpunit/BltProject/BuildTest.php
index a6c9ad10f..4dbddda0f 100644
--- a/template/tests/phpunit/Bolt/BuildTest.php
+++ b/tests/phpunit/BltProject/BuildTest.php
@@ -1,18 +1,22 @@
 <?php
 
-namespace Drupal\Tests\PHPUnit;
+namespace Acquia\Blt\Tests\BltProject;
+
+use Acquia\Blt\Tests\BltProjectTestBase;
 
 /**
  * Class BuildTest.
  *
  * Verifies that build tasks work as expected.
  */
-class BuildTest extends TestBase {
+class BuildTest extends BltProjectTestBase {
 
   /**
    * Tests Phing setup:make target.
    *
    * This should build /make.yml.
+   *
+   * @group blt-project
    */
   public function testSetupMake() {
 
diff --git a/template/tests/phpunit/Bolt/DrushTest.php b/tests/phpunit/BltProject/DrushTest.php
similarity index 55%
rename from template/tests/phpunit/Bolt/DrushTest.php
rename to tests/phpunit/BltProject/DrushTest.php
index ff1d6b86f..bfde5355f 100644
--- a/template/tests/phpunit/Bolt/DrushTest.php
+++ b/tests/phpunit/BltProject/DrushTest.php
@@ -1,23 +1,29 @@
 <?php
 
-namespace Drupal\Tests\PHPUnit;
+namespace Acquia\Blt\Tests\BltProject;
+
+use Acquia\Blt\Tests\BltProjectTestBase;
 
 /**
  * Class DrushTest.
  *
  * Verifies that git related tasks work as expected.
  */
-class DrushTest extends TestBase {
+class DrushTest extends BltProjectTestBase {
 
   /**
    * Tests that correct drush configuration is loaded.
+   *
+   * @group blt-project
    */
   public function testDrushConfig() {
 
     // We must define the absolute path of the binary because child shell
     // processes in PHP to not inherit $PATH setting from environment.
     $drush_bin = $this->projectDirectory . '/vendor/bin/drush';
-    $command = "$drush_bin status";
+    // Use --format=json output so we don't have to deal with output line
+    // wrapping when running the tests.
+    $command = "$drush_bin status --format=json";
 
     // Test that drush can be run from the following directories.
     $dirs = array(
@@ -29,9 +35,10 @@ public function testDrushConfig() {
     foreach ($dirs as $dir) {
       chdir($dir);
       print "Executing \"$command\" in $dir \n";
-      // If it contains the local URI, we know it is correctly loading
-      // drushrc.php.
-      $this->assertContains($this->config['project']['local']['hostname'], shell_exec($command));
+      $json_output = shell_exec($command);
+      $drush_output = json_decode($json_output, TRUE);
+      // Check for the path to drushrc.php that is included in the project.
+      $this->assertContains($this->projectDirectory . '/drush/drushrc.php', $drush_output['drush-conf']);
     }
   }
 
diff --git a/template/tests/phpunit/Bolt/GitTest.php b/tests/phpunit/BltProject/GitTest.php
similarity index 91%
rename from template/tests/phpunit/Bolt/GitTest.php
rename to tests/phpunit/BltProject/GitTest.php
index fd5c53fc3..d2dd281f8 100644
--- a/template/tests/phpunit/Bolt/GitTest.php
+++ b/tests/phpunit/BltProject/GitTest.php
@@ -1,16 +1,20 @@
 <?php
 
-namespace Drupal\Tests\PHPUnit;
+namespace Acquia\Blt\Tests\BltProject;
+
+use Acquia\Blt\Tests\BltProjectTestBase;
 
 /**
  * Class GitTasksTest.
  *
  * Verifies that git related tasks work as expected.
  */
-class GitTasksTest extends TestBase {
+class GitTasksTest extends BltProjectTestBase {
 
   /**
    * Tests Phing setup:git-hooks target.
+   *
+   * @group blt-project
    */
   public function testGitConfig() {
     $this->assertFileExists($this->projectDirectory . '/.git');
@@ -29,6 +33,8 @@ public function testGitConfig() {
    *   The PHPUnit message to be output for this datapoint.
    *
    * @dataProvider providerTestGitHookCommitMsg
+   *
+   * @group blt-project
    */
   public function testGitHookCommitMsg($is_valid, $commit_message, $message = NULL) {
     $this->assertCommitMessageValidity($is_valid, $commit_message, $message);
@@ -38,7 +44,7 @@ public function testGitHookCommitMsg($is_valid, $commit_message, $message = NULL
    * Data provider.
    */
   public function providerTestGitHookCommitMsg() {
-    $prefix = $this->config['project']['prefix'];
+    $prefix = isset($this->config['project']) ? $this->config['project']['prefix'] : '';
     return array(
       array(FALSE, "This is a bad commit.", 'Missing prefix and ticket number.'),
       array(FALSE, "123: This is a bad commit.", 'Missing project prefix.'),
@@ -57,6 +63,8 @@ public function providerTestGitHookCommitMsg() {
    * Tests operation of scripts/git-hooks/pre-commit.
    *
    * Should assert that code validation via phpcs is functioning.
+   *
+   * @group blt-project
    */
   public function testGitPreCommitHook() {
     // Commits must be executed inside of new project directory.
diff --git a/template/tests/phpunit/Bolt/SettingsTest.php b/tests/phpunit/BltProject/SettingsTest.php
similarity index 85%
rename from template/tests/phpunit/Bolt/SettingsTest.php
rename to tests/phpunit/BltProject/SettingsTest.php
index db8401335..3e62be8b6 100644
--- a/template/tests/phpunit/Bolt/SettingsTest.php
+++ b/tests/phpunit/BltProject/SettingsTest.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace Drupal\Tests\PHPUnit;
+namespace Acquia\Blt\Tests\BltProject;
+
+use Acquia\Blt\Tests\BltProjectTestBase;
 
 /**
  * Class SettingsTest.
  *
  * Verifies $settings.php configuration.
  */
-class SettingsTest extends TestBase {
+class SettingsTest extends BltProjectTestBase {
 
   /**
    * Sets up require parameters for tests to run.
@@ -29,6 +31,8 @@ public function setupParams($env) {
 
   /**
    * Test configuration for production environment on ACE.
+   *
+   * @group blt-project
    */
   public function testProd() {
 
@@ -40,6 +44,8 @@ public function testProd() {
 
   /**
    * Tests Phing setup:drupal:settings target.
+   *
+   * @group blt-project
    */
   public function testSetupLocalSettings() {
 
diff --git a/tests/phpunit/src/BltProjectTestBase.php b/tests/phpunit/src/BltProjectTestBase.php
new file mode 100644
index 000000000..b652511c6
--- /dev/null
+++ b/tests/phpunit/src/BltProjectTestBase.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Acquia\Blt\Tests;
+
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Class BltProjectTestBase.
+ *
+ * Base class for all tests that are executed within a blt project.
+ */
+abstract class BltProjectTestBase extends \PHPUnit_Framework_TestCase {
+
+  protected $projectDirectory;
+  protected $drupalRoot;
+  protected $config = [];
+
+  /**
+   * BltProjectTestBase constructor.
+   *
+   * @inheritdoc
+   */
+  public function __construct($name = NULL, array $data = [], $dataName = '') {
+    parent::__construct($name, $data, $dataName);
+
+    // This seems super hacky, but when blt is included as a symlink in the
+    // test project, php resolves the symlink and we end up in the wrong
+    // directory when Travis runs the tests.
+    if (strpos(__DIR__, 'vendor/acquia') !== FALSE) {
+      $this->projectDirectory = dirname(dirname(dirname(dirname(dirname(dirname((__DIR__)))))));
+    }
+    else {
+      $this->projectDirectory = getcwd();
+    }
+
+    $this->drupalRoot = $this->projectDirectory . '/docroot';
+    if (file_exists("{$this->projectDirectory}/project.yml")) {
+      $this->config = Yaml::parse(file_get_contents("{$this->projectDirectory}/project.yml"));
+    }
+    if (file_exists("{$this->projectDirectory}/project.local.yml")) {
+      $this->config = array_replace_recursive($this->config, Yaml::parse(file_get_contents("{$this->projectDirectory}/project.local.yml")));
+    }
+  }
+
+}
diff --git a/tests/phpunit/src/BltTestBase.php b/tests/phpunit/src/BltTestBase.php
new file mode 100644
index 000000000..4806c2d67
--- /dev/null
+++ b/tests/phpunit/src/BltTestBase.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Acquia\Blt\Tests;
+
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Class BltTestBase.
+ *
+ * Base class for all tests that are executed for BLT itself.
+ */
+abstract class BltTestBase extends \PHPUnit_Framework_TestCase {
+
+  protected $bltDirectory;
+  protected $drupalRoot;
+  protected $config;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->bltDirectory = realpath(dirname(__FILE__) . '/../../');
+    $this->newProjectDir = dirname(dirname($this->bltDirectory)) . '/blt-project';
+    $this->config = Yaml::parse(file_get_contents("{$this->newProjectDir}/project.yml"));
+
+  }
+
+}