diff --git a/tests/all_tests.php b/tests/all_tests.php
index feaaa1f0a1..4c2fa891a2 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -26,6 +26,7 @@ require_once 'dbal/all_tests.php';
 require_once 'regex/all_tests.php';
 require_once 'network/all_tests.php';
 require_once 'random/all_tests.php';
+require_once 'download/all_tests.php';
 
 // exclude the test directory from code coverage reports
 if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0)
@@ -59,6 +60,7 @@ class phpbb_all_tests
 		$suite->addTest(phpbb_regex_all_tests::suite());
 		$suite->addTest(phpbb_network_all_tests::suite());
 		$suite->addTest(phpbb_random_all_tests::suite());
+		$suite->addTest(phpbb_download_all_tests::suite());
 
 		return $suite;
 	}
diff --git a/tests/download/all_tests.php b/tests/download/all_tests.php
new file mode 100644
index 0000000000..59a937f70a
--- /dev/null
+++ b/tests/download/all_tests.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_download_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+class phpbb_download_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Download Tests');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_download_all_tests::main')
+{
+	phpbb_regex_all_tests::main();
+}