diff --git a/cli/Valet/Drivers/ValetDriver.php b/cli/Valet/Drivers/ValetDriver.php
index a9d7294..22ba384 100644
--- a/cli/Valet/Drivers/ValetDriver.php
+++ b/cli/Valet/Drivers/ValetDriver.php
@@ -2,6 +2,11 @@
 
 namespace Valet\Drivers;
 
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RecursiveRegexIterator;
+use RegexIterator;
+
 abstract class ValetDriver
 {
     /**
@@ -76,7 +81,8 @@ public static function assign($sitePath, $siteName, $uri)
         $drivers[] = 'BasicValetDriver';
 
         foreach ($drivers as $driver) {
-            $driver = new $driver;
+            $className = "Valet\Drivers\\$driver";
+            $driver = new $className;
 
             if ($driver->serves($sitePath, $siteName, $driver->mutateUri($uri))) {
                 return $driver;
diff --git a/tests/Drivers/ValetDriverTest.php b/tests/Drivers/ValetDriverTest.php
new file mode 100644
index 0000000..f73362b
--- /dev/null
+++ b/tests/Drivers/ValetDriverTest.php
@@ -0,0 +1,22 @@
+<?php
+
+use Valet\Drivers\ValetDriver;
+
+class ValetDriverTest extends BaseDriverTestCase
+{
+    public function test_it_gets_drivers_in_given_path()
+    {
+        $output = ValetDriver::driversIn(__DIR__ . '/../files/Drivers');
+
+        $this->assertEquals(2, count($output));
+        $this->assertContains('Test1ValetDriver', $output);
+        $this->assertContains('Test2ValetDriver', $output);
+    }
+
+    public function test_it_assigns_drivers_to_given_project()
+    {
+        $assignedDriver = ValetDriver::assign($this->projectDir('bedrock'), 'my-site', '/');
+
+        $this->assertEquals('Valet\Drivers\BedrockValetDriver', get_class($assignedDriver));
+    }
+}
diff --git a/tests/files/Drivers/Test1ValetDriver.php b/tests/files/Drivers/Test1ValetDriver.php
new file mode 100644
index 0000000..e69de29
diff --git a/tests/files/Drivers/Test2ValetDriver.php b/tests/files/Drivers/Test2ValetDriver.php
new file mode 100644
index 0000000..e69de29