diff --git a/laravel/auth.php b/laravel/auth.php
index f692e52b..d1828c5b 100644
--- a/laravel/auth.php
+++ b/laravel/auth.php
@@ -190,7 +190,7 @@ protected static function remember($id)
 
 		// This method assumes the "remember me" cookie should have the same
 		// configuration as the session cookie. Since this cookie, like the
-		// session cookie, should be kept very secure, it's probably safe
+		// session cookie, should be kept very secure, it's probably safe.
 		// to assume the cookie settings are the same.
 		$config = Config::get('session');
 
diff --git a/phpunit.php b/phpunit.php
index d6817b48..412d1748 100644
--- a/phpunit.php
+++ b/phpunit.php
@@ -27,4 +27,9 @@
 // --------------------------------------------------------------
 // Bootstrap the Laravel core.
 // --------------------------------------------------------------
-require SYS_PATH.'core.php';
\ No newline at end of file
+require SYS_PATH.'core.php';
+
+// --------------------------------------------------------------
+// Start the default bundle.
+// --------------------------------------------------------------
+Bundle::start(DEFAULT_BUNDLE);
\ No newline at end of file
diff --git a/tests/cases/laravel/autoloader.test.php b/tests/cases/laravel/autoloader.test.php
new file mode 100644
index 00000000..9aafa330
--- /dev/null
+++ b/tests/cases/laravel/autoloader.test.php
@@ -0,0 +1,74 @@
+<?php
+
+class AutoloaderTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * Test the Autoloader::map method.
+	 *
+	 * @group laravel
+	 */
+	public function testMapsCanBeRegistered()
+	{
+		Autoloader::map(array(
+			'Foo' => APP_PATH.'models/foo.php',
+		));
+
+		$this->assertEquals(APP_PATH.'models/foo.php', Autoloader::$mappings['Foo']);
+	}
+
+	/**
+	 * Test the Autoloader::alias method.
+	 *
+	 * @group laravel
+	 */
+	public function testAliasesCanBeRegistered()
+	{
+		Autoloader::alias('Foo\\Bar', 'Foo');
+
+		$this->assertEquals('Foo\\Bar', Autoloader::$aliases['Foo']);
+	}
+
+	/**
+	 * Test the Autoloader::psr method.
+	 *
+	 * @group laravel
+	 */
+	public function testPsrDirectoriesCanBeRegistered()
+	{
+		Autoloader::psr(array(
+			APP_PATH.'foo'.DS.'bar',
+			APP_PATH.'foo'.DS.'baz'.DS.DS,
+		));
+
+		$this->assertTrue(in_array(APP_PATH.'foo'.DS.'bar'.DS, Autoloader::$psr));
+		$this->assertTrue(in_array(APP_PATH.'foo'.DS.'baz'.DS, Autoloader::$psr));
+	}
+
+	/**
+	 * Test the Autoloader::namespaces method.
+	 *
+	 * @group laravel
+	 */
+	public function testNamespacesCanBeRegistered()
+	{
+		Autoloader::namespaces(array(
+			'Autoloader_1' => BUNDLE_PATH.'autoload'.DS.'models',
+			'Autoloader_2' => BUNDLE_PATH.'autoload'.DS.'libraries'.DS.DS,
+		));
+
+		$this->assertEquals(BUNDLE_PATH.'autoload'.DS.'models'.DS, Autoloader::$namespaces['Autoloader_1']);
+		$this->assertEquals(BUNDLE_PATH.'autoload'.DS.'libraries'.DS, Autoloader::$namespaces['Autoloader_2']);
+	}
+
+	/**
+	 * Test the loading of PSR-0 models and libraries.
+	 *
+	 * @group laravel
+	 */
+	public function testPsrLibrariesAndModelsCanBeLoaded()
+	{
+		$this->assertInstanceOf('User', new User);
+		$this->assertInstanceOf('Repositories\\User', new Repositories\User);
+	}
+
+}
\ No newline at end of file
diff --git a/tests/laravel/models/repositories/user.php b/tests/laravel/models/repositories/user.php
new file mode 100644
index 00000000..093ec2b0
--- /dev/null
+++ b/tests/laravel/models/repositories/user.php
@@ -0,0 +1,3 @@
+<?php namespace Repositories;
+
+class User {}
\ No newline at end of file
diff --git a/tests/laravel/models/user.php b/tests/laravel/models/user.php
new file mode 100644
index 00000000..5ca0ab92
--- /dev/null
+++ b/tests/laravel/models/user.php
@@ -0,0 +1,3 @@
+<?php
+
+class User {}
\ No newline at end of file