diff --git a/.travis.yml b/.travis.yml
index dec34d4..736787e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ matrix:
         - php: 7.0
     fast_finish: true
 sudo: false
+services:
+  - docker
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/resources/conf/mysql.cnf b/resources/conf/mysql.cnf
index 591d91a..b5713a7 100644
--- a/resources/conf/mysql.cnf
+++ b/resources/conf/mysql.cnf
@@ -8,7 +8,7 @@ socket		= /var/run/mysqld/mysqld.sock
 nice		= 0
 
 [mysqld]
-user		= root
+user		= mysql
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
 port		= 3306
diff --git a/src/Docker/ComposeContainers.php b/src/Docker/ComposeContainers.php
index 67ffeca..f80ad2e 100644
--- a/src/Docker/ComposeContainers.php
+++ b/src/Docker/ComposeContainers.php
@@ -80,7 +80,7 @@ public function addDatabase()
     {
         $this->config['mariadb'] = [
             // @todo if comman run with verbose, tag verbose.
-          'command' => 'mysqld --user=root --verbose',
+          'command' => 'mysqld --verbose',
           'image' => 'mariadb',
           'ports' => [
             '3306',
diff --git a/tests/Utils/BaseUtilsTest.php b/tests/BaseTest.php
similarity index 61%
rename from tests/Utils/BaseUtilsTest.php
rename to tests/BaseTest.php
index f295c9c..77aefb8 100644
--- a/tests/Utils/BaseUtilsTest.php
+++ b/tests/BaseTest.php
@@ -1,18 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mglaman
- * Date: 8/30/15
- * Time: 5:39 AM
- */
 
-namespace mglaman\PlatformDocker\Tests\Utils;
+namespace mglaman\PlatformDocker\Tests;
 
 use mglaman\PlatformDocker\Config;
 
-abstract class BaseUtilsTest extends \PHPUnit_Framework_TestCase
+abstract class BaseTest extends \PHPUnit_Framework_TestCase
 {
     protected static $tmpName;
+    protected static $dockerCleanup = FALSE;
 
     /**
      * Sets up the fixture, for example, open a network connection.
@@ -30,6 +25,12 @@ protected function setUp()
      */
     public static function tearDownAfterClass()
     {
+        if (self::$dockerCleanup) {
+            $dir_path = explode(DIRECTORY_SEPARATOR, self::$tmpName);
+            $project_prefix = strtolower(end($dir_path));
+            exec('docker stop $(docker ps -q -f name=' . $project_prefix . ')');
+            exec('docker rm $(docker ps -q -f name=' . $project_prefix . ')');
+        }
         exec('rm -Rf ' . escapeshellarg(self::$tmpName));
     }
 
diff --git a/tests/Commands/RebuildCommandTest.php b/tests/Commands/RebuildCommandTest.php
new file mode 100644
index 0000000..00266c3
--- /dev/null
+++ b/tests/Commands/RebuildCommandTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace mglaman\PlatformDocker\Tests\Commands;
+
+use mglaman\Docker\Docker;
+use mglaman\PlatformDocker\Command\Docker\RebuildCommand;
+use mglaman\PlatformDocker\Tests\BaseTest;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class RebuildCommandTest extends BaseTest
+{
+    protected static $dockerCleanup = TRUE;
+
+    public function testRunCommand()
+    {
+        $tester = new CommandTester(new RebuildCommand());
+        $tester->execute([], ['interactive' => true]);
+        // Let all containers boot
+        sleep(20);
+
+        $dir_path = explode(DIRECTORY_SEPARATOR, self::$tmpName);
+        $project_prefix = strtolower(end($dir_path));
+        $process = Docker::inspect(['--format="{{ .State.Running }}"', $project_prefix . '_nginx_1'], true);
+        $this->assertTrue(trim($process->getOutput()) == '"true"', $project_prefix . '_nginx_1 as not running');
+        $process = Docker::inspect(['--format="{{ .State.Running }}"', $project_prefix . '_phpfpm_1'], true);
+        $this->assertTrue(trim($process->getOutput()) == '"true"', $project_prefix . '_phpfpm_1 as not running');
+        // MariaDB takes a little.
+        $process = Docker::inspect(['--format="{{ .State.Running }}"', $project_prefix . '_mariadb_1'], true);
+        $this->assertTrue(trim($process->getOutput()) == '"true"', $project_prefix . '_mariadb_1 as not running');
+    }
+}
\ No newline at end of file
diff --git a/tests/Utils/ComposeContainersTest.php b/tests/Utils/ComposeContainersTest.php
index 1eed16a..d1b1a12 100644
--- a/tests/Utils/ComposeContainersTest.php
+++ b/tests/Utils/ComposeContainersTest.php
@@ -1,19 +1,14 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mglaman
- * Date: 8/30/15
- * Time: 7:31 AM
- */
 
 namespace mglaman\PlatformDocker\Tests\Utils;
 
 
 use mglaman\PlatformDocker\Docker\ComposeContainers;
 use mglaman\PlatformDocker\Platform;
+use mglaman\PlatformDocker\Tests\BaseTest;
 use Symfony\Component\Yaml\Yaml;
 
-class ComposeContainersTest extends BaseUtilsTest
+class ComposeContainersTest extends BaseTest
 {
     public function testDefaultConfig()
     {
diff --git a/tests/Utils/ConfigTest.php b/tests/Utils/ConfigTest.php
index bd04368..e260c09 100644
--- a/tests/Utils/ConfigTest.php
+++ b/tests/Utils/ConfigTest.php
@@ -10,8 +10,9 @@
 
 
 use mglaman\PlatformDocker\Config;
+use mglaman\PlatformDocker\Tests\BaseTest;
 
-class ConfigTest extends BaseUtilsTest
+class ConfigTest extends BaseTest
 {
 
     public function testGet()
diff --git a/tests/Utils/PlatformTest.php b/tests/Utils/PlatformTest.php
index 0ac273b..a062254 100644
--- a/tests/Utils/PlatformTest.php
+++ b/tests/Utils/PlatformTest.php
@@ -10,8 +10,9 @@
 
 use mglaman\PlatformDocker\Config;
 use mglaman\PlatformDocker\Platform;
+use mglaman\PlatformDocker\Tests\BaseTest;
 
-class PlatformTest extends BaseUtilsTest
+class PlatformTest extends BaseTest
 {
     public function testProjectName()
     {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 15f910c..6ed38f8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,3 +4,5 @@
  * A script containing any set-up steps required for PHPUnit testing.
  */
 require __DIR__ . '/../vendor/autoload.php';
+
+define('CLI_ROOT', dirname(__DIR__));
\ No newline at end of file