diff --git a/application/config/autoload.php b/application/config/autoload.php
index 866b477..6e2e36e 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -60,7 +60,7 @@
 |	$autoload['libraries'] = array('user_agent' => 'ua');
 */
 
-$autoload['libraries'] = array('session', 'form_validation');
+$autoload['libraries'] = array('session', 'form_validation', 'subdir/baz');
 
 
 /*
diff --git a/application/controllers/Ci_autoload_library.php b/application/controllers/Ci_autoload_library.php
new file mode 100644
index 0000000..208b097
--- /dev/null
+++ b/application/controllers/Ci_autoload_library.php
@@ -0,0 +1,9 @@
+<?php
+
+class Ci_autoload_library extends CI_Controller
+{
+	public function subdir()
+	{
+		echo $this->baz->doSomething();
+	}
+}
diff --git a/application/libraries/subdir/Baz.php b/application/libraries/subdir/Baz.php
new file mode 100644
index 0000000..ecd9d78
--- /dev/null
+++ b/application/libraries/subdir/Baz.php
@@ -0,0 +1,9 @@
+<?php
+
+class Baz
+{
+	public function doSomething()
+	{
+		return 'Baz something';
+	}
+}
diff --git a/application/tests/controllers/Ci_autoload_library_test.php b/application/tests/controllers/Ci_autoload_library_test.php
new file mode 100644
index 0000000..d13ee75
--- /dev/null
+++ b/application/tests/controllers/Ci_autoload_library_test.php
@@ -0,0 +1,10 @@
+<?php
+
+class Ci_autoload_library_test extends TestCase
+{
+	public function test_index()
+	{
+		$output = $this->request('GET', 'ci_autoload_library/subdir');
+		$this->assertEquals('Baz something', $output);
+	}
+}