diff --git a/composer.json b/composer.json
index c2ceddc1..a538a906 100644
--- a/composer.json
+++ b/composer.json
@@ -7,5 +7,12 @@
 	"require-dev": {
 		"jbrooksuk/phpcheckstyle": "dev-master",
 		"phpunit/phpunit": "4.2.*"
+	},
+
+	"autoload": {
+		"psr-4": {
+			"Szurubooru\\Tests\\": "tests/",
+			"Szurubooru\\": "src/"
+		}
 	}
 }
diff --git a/gruntfile.js b/gruntfile.js
index 4247b77b..3e5fcd41 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -79,7 +79,7 @@ module.exports = function(grunt) {
 			},
 
 			tests: {
-				command: 'php vendor/phpunit/phpunit/phpunit -v --strict --bootstrap src/AutoLoader.php tests/',
+				command: 'php vendor/phpunit/phpunit/phpunit -v --strict --bootstrap src/Bootstrap.php tests/',
 			},
 
 			upgrade: {
diff --git a/public_html/api-dispatch.php b/public_html/api-dispatch.php
index d76ac8b1..4bc5a20b 100644
--- a/public_html/api-dispatch.php
+++ b/public_html/api-dispatch.php
@@ -1,7 +1,9 @@
 <?php
 $start = microtime(true);
 
-require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'AutoLoader.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'Bootstrap.php');
+
+\Szurubooru\Bootstrap::init();
 $httpHelper = \Szurubooru\Injector::get(\Szurubooru\Helpers\HttpHelper::class);
 $dispatcher = \Szurubooru\Injector::get(\Szurubooru\Dispatcher::class);
 $dispatcher->run($httpHelper->getRequestMethod(), $_GET['q']);
diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index 89a20d64..9bd127e2 100644
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -2,7 +2,7 @@
 require_once(__DIR__
 	. DIRECTORY_SEPARATOR . '..'
 	. DIRECTORY_SEPARATOR . 'src'
-	. DIRECTORY_SEPARATOR . 'AutoLoader.php');
+	. DIRECTORY_SEPARATOR . 'Bootstrap.php');
 
 $upgradeService = Szurubooru\Injector::get(\Szurubooru\Services\UpgradeService::class);
 $upgradeService->runUpgradesVerbose();
diff --git a/src/AutoLoader.php b/src/AutoLoader.php
deleted file mode 100644
index cbdaa98f..00000000
--- a/src/AutoLoader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace Szurubooru;
-
-final class AutoLoader
-{
-	public static function init()
-	{
-		spl_autoload_register([__CLASS__, 'includeClassName']);
-	}
-
-	public static function includeClassName($className)
-	{
-		if (strpos($className, 'Szurubooru') === false)
-			return;
-		$className = str_replace('\\', DIRECTORY_SEPARATOR, $className);
-		$className = str_replace('Szurubooru', '', $className);
-		if (strpos($className, 'Tests') !== false)
-			$className = dirname(__DIR__) . DIRECTORY_SEPARATOR . str_replace('Tests', 'tests', $className);
-		else
-			$className = __DIR__ . DIRECTORY_SEPARATOR . $className;
-		$className .= '.php';
-		include($className);
-	}
-}
-
-AutoLoader::init();
-
-require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
-
-function turnErrorsIntoExceptions()
-{
-	set_error_handler(
-		function($errno, $errstr, $errfile, $errline, array $errcontext)
-		{
-			throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-		});
-}
-
-turnErrorsIntoExceptions();
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
new file mode 100644
index 00000000..9e83ffc3
--- /dev/null
+++ b/src/Bootstrap.php
@@ -0,0 +1,30 @@
+<?php
+namespace Szurubooru;
+
+final class Bootstrap
+{
+	public static function init()
+	{
+		self::turnErrorsIntoExceptions();
+		self::initAutoloader();
+	}
+
+	private static function initAutoloader()
+	{
+		require(__DIR__
+			. DIRECTORY_SEPARATOR . '..'
+			. DIRECTORY_SEPARATOR . 'vendor'
+			. DIRECTORY_SEPARATOR . 'autoload.php');
+	}
+
+	private static function turnErrorsIntoExceptions()
+	{
+		set_error_handler(
+			function($errno, $errstr, $errfile, $errline, array $errcontext)
+			{
+				throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+			});
+	}
+}
+
+Bootstrap::init();
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
index 4df4d8ab..110ba2c6 100644
--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -6,6 +6,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
 	protected function setUp()
 	{
 		\Szurubooru\Injector::init();
+		date_default_timezone_set('UTC');
 	}
 
 	protected function tearDown()
@@ -100,10 +101,3 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
 		}
 	}
 }
-
-require_once __DIR__
-	. DIRECTORY_SEPARATOR . '..'
-	. DIRECTORY_SEPARATOR . 'vendor'
-	. DIRECTORY_SEPARATOR . 'autoload.php';
-
-date_default_timezone_set('UTC');