diff --git a/cli/includes/helpers.php b/cli/includes/helpers.php
index a056f8a..66d6ce4 100644
--- a/cli/includes/helpers.php
+++ b/cli/includes/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Valet;
+
 use Illuminate\Container\Container;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Console\Output\ConsoleOutput;
diff --git a/tests/BrewTest.php b/tests/BrewTest.php
index b56ad02..800e4c9 100644
--- a/tests/BrewTest.php
+++ b/tests/BrewTest.php
@@ -3,6 +3,9 @@
 use Valet\Brew;
 use Valet\Filesystem;
 use Valet\CommandLine;
+use function Valet\user;
+use function Valet\resolve;
+use function Valet\swap;
 use Illuminate\Container\Container;
 
 class BrewTest extends PHPUnit_Framework_TestCase
diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
index 46c7d74..9300ec3 100644
--- a/tests/ConfigurationTest.php
+++ b/tests/ConfigurationTest.php
@@ -4,6 +4,9 @@
 use Valet\Valet;
 use Valet\Filesystem;
 use Valet\Configuration;
+use function Valet\user;
+use function Valet\resolve;
+use function Valet\swap;
 use Illuminate\Container\Container;
 
 class ConfigurationTest extends PHPUnit_Framework_TestCase
diff --git a/tests/DnsMasqTest.php b/tests/DnsMasqTest.php
index 91868fc..8dffe9d 100644
--- a/tests/DnsMasqTest.php
+++ b/tests/DnsMasqTest.php
@@ -4,6 +4,9 @@
 use Valet\DnsMasq;
 use Valet\Filesystem;
 use Valet\CommandLine;
+use function Valet\user;
+use function Valet\resolve;
+use function Valet\swap;
 use Illuminate\Container\Container;
 
 class DnsMasqTest extends PHPUnit_Framework_TestCase
diff --git a/tests/NginxTest.php b/tests/NginxTest.php
index 5cd3813..e96d2e5 100644
--- a/tests/NginxTest.php
+++ b/tests/NginxTest.php
@@ -4,6 +4,9 @@
 use Valet\Nginx;
 use Valet\Filesystem;
 use Valet\Configuration;
+use function Valet\user;
+use function Valet\resolve;
+use function Valet\swap;
 use Illuminate\Container\Container;
 
 class NginxTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PhpFpmTest.php b/tests/PhpFpmTest.php
index 3b7ec90..0af150e 100644
--- a/tests/PhpFpmTest.php
+++ b/tests/PhpFpmTest.php
@@ -1,6 +1,8 @@
 <?php
 
 use Valet\PhpFpm;
+use function Valet\user;
+use function Valet\resolve;
 use Illuminate\Container\Container;
 
 class PhpFpmTest extends PHPUnit_Framework_TestCase
diff --git a/tests/SiteTest.php b/tests/SiteTest.php
index d4c658d..71362ec 100644
--- a/tests/SiteTest.php
+++ b/tests/SiteTest.php
@@ -3,6 +3,9 @@
 use Valet\Site;
 use Valet\Filesystem;
 use Valet\Configuration;
+use function Valet\user;
+use function Valet\resolve;
+use function Valet\swap;
 use Illuminate\Container\Container;
 
 class SiteTest extends PHPUnit_Framework_TestCase