diff --git a/tests/CommentAddTest.php b/tests/JobTests/AddCommentJobTest.php
similarity index 98%
rename from tests/CommentAddTest.php
rename to tests/JobTests/AddCommentJobTest.php
index c8a5ca6b..f301826f 100644
--- a/tests/CommentAddTest.php
+++ b/tests/JobTests/AddCommentJobTest.php
@@ -1,5 +1,5 @@
 <?php
-class CommentAddTest extends AbstractTest
+class AddCommentJobTest extends AbstractTest
 {
 	protected $user;
 
diff --git a/tests/CommentDeleteTest.php b/tests/JobTests/DeleteCommentJobTest.php
similarity index 97%
rename from tests/CommentDeleteTest.php
rename to tests/JobTests/DeleteCommentJobTest.php
index 46f094dc..f6d6b10e 100644
--- a/tests/CommentDeleteTest.php
+++ b/tests/JobTests/DeleteCommentJobTest.php
@@ -1,5 +1,5 @@
 <?php
-class CommentDeleteTest extends AbstractTest
+class DeleteCommentJobTest extends AbstractTest
 {
 	public function testOwn()
 	{
diff --git a/tests/CommentEditTest.php b/tests/JobTests/EditCommentJobTest.php
similarity index 98%
rename from tests/CommentEditTest.php
rename to tests/JobTests/EditCommentJobTest.php
index 49e48022..b247e49c 100644
--- a/tests/CommentEditTest.php
+++ b/tests/JobTests/EditCommentJobTest.php
@@ -1,5 +1,5 @@
 <?php
-class CommentEditTest extends AbstractTest
+class EditCommentJobTest extends AbstractTest
 {
 	public function testOwn()
 	{
diff --git a/tests/CommentListTest.php b/tests/JobTests/ListCommentsJobTest.php
similarity index 97%
rename from tests/CommentListTest.php
rename to tests/JobTests/ListCommentsJobTest.php
index 9a387867..f7fc9c49 100644
--- a/tests/CommentListTest.php
+++ b/tests/JobTests/ListCommentsJobTest.php
@@ -1,5 +1,5 @@
 <?php
-class CommentListTest extends AbstractTest
+class ListCommentJobTest extends AbstractTest
 {
 	public function testNone()
 	{
diff --git a/tests/CommentPreviewTest.php b/tests/JobTests/PreviewCommentJobTest.php
similarity index 97%
rename from tests/CommentPreviewTest.php
rename to tests/JobTests/PreviewCommentJobTest.php
index c72d2226..a042cb95 100644
--- a/tests/CommentPreviewTest.php
+++ b/tests/JobTests/PreviewCommentJobTest.php
@@ -1,5 +1,5 @@
 <?php
-class CommentPreviewTest extends AbstractTest
+class PreviewCommentJobTest extends AbstractTest
 {
 	public function testPreview()
 	{
diff --git a/tests/MiscTest.php b/tests/MiscTests/LoggerTest.php
similarity index 64%
rename from tests/MiscTest.php
rename to tests/MiscTests/LoggerTest.php
index cd6b791d..fd538374 100644
--- a/tests/MiscTest.php
+++ b/tests/MiscTests/LoggerTest.php
@@ -1,22 +1,6 @@
 <?php
-class MiscTest extends AbstractTest
+class LoggerTest extends AbstractTest
 {
-	public function testEncryption()
-	{
-		$lengths = [0];
-		for ($i = 0; $i < 20; $i ++)
-			$lengths []= mt_rand(0, 10000);
-
-		foreach ($lengths as $length)
-		{
-			$text = '';
-			foreach (range(0, $length) as $j)
-				$text .= chr(mt_rand(1, 255));
-
-			$this->assert->areEqual($text, TextHelper::decrypt(TextHelper::encrypt($text)));
-		}
-	}
-
 	public function testLogging()
 	{
 		$logPath = __DIR__ . '/logs/{yyyy}-{mm}-{dd}.log';
diff --git a/tests/MiscTests/TextHelperTest.php b/tests/MiscTests/TextHelperTest.php
new file mode 100644
index 00000000..e50035c3
--- /dev/null
+++ b/tests/MiscTests/TextHelperTest.php
@@ -0,0 +1,19 @@
+<?php
+class TextHelperTest extends AbstractTest
+{
+	public function testEncryption()
+	{
+		$lengths = [0];
+		for ($i = 0; $i < 20; $i ++)
+			$lengths []= mt_rand(0, 10000);
+
+		foreach ($lengths as $length)
+		{
+			$text = '';
+			foreach (range(0, $length) as $j)
+				$text .= chr(mt_rand(1, 255));
+
+			$this->assert->areEqual($text, TextHelper::decrypt(TextHelper::encrypt($text)));
+		}
+	}
+}
diff --git a/tests/run-all.php b/tests/run-all.php
index 02f286ef..e5628403 100644
--- a/tests/run-all.php
+++ b/tests/run-all.php
@@ -1,4 +1,8 @@
 <?php
+require_once __DIR__ . '/../src/core.php';
+require_once __DIR__ . '/../src/upgrade.php';
+\Chibi\Autoloader::registerFileSystem(__DIR__);
+
 $configPath = __DIR__ . '/test.ini';
 
 $options = getopt('cf:', ['clean', 'filter:']);
@@ -35,9 +39,6 @@ try
 
 	file_put_contents($configPath, implode(PHP_EOL, $configIni));
 
-	require_once __DIR__ . '/../src/core.php';
-	require_once __DIR__ . '/../src/upgrade.php';
-
 	upgradeDatabase();
 
 	runAll($filter);
@@ -49,7 +50,15 @@ finally
 
 function getTestMethods($filter)
 {
-	$testClasses = \Chibi\Util\Reflection::loadClasses(glob(__DIR__ . '/*Test.php'));
+	$testFiles = [];
+	foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__)) as $fileName)
+	{
+		$path = $fileName->getPathname();
+		if (preg_match('/.*Test.php$/', $path))
+			$testFiles []= $path;
+	}
+
+	$testClasses = \Chibi\Util\Reflection::loadClasses($testFiles);
 
 	if ($filter !== null)
 	{