diff --git a/tests/functional/fileupload_test_form.php b/tests/functional/fileupload_form_test.php
similarity index 94%
rename from tests/functional/fileupload_test_form.php
rename to tests/functional/fileupload_form_test.php
index 2413cd01d2..3e1ba71a71 100644
--- a/tests/functional/fileupload_test_form.php
+++ b/tests/functional/fileupload_form_test.php
@@ -10,12 +10,13 @@
 /**
  * @group functional
  */
-class phpbb_functional_fileupload_test_form extends phpbb_functional_test_case
+class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 {
 	private $path;
 
-	protected function setUp()
+	public function setUp()
 	{
+		parent::setUp();
 		$this->path = __DIR__ . '/fixtures/files/';
 		$this->add_lang('posting');
 		$this->login();
diff --git a/tests/functional/fileupload_test_remote.php b/tests/functional/fileupload_remote_test.php
similarity index 92%
rename from tests/functional/fileupload_test_remote.php
rename to tests/functional/fileupload_remote_test.php
index ac55a078d4..0deb79acf6 100644
--- a/tests/functional/fileupload_test_remote.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -10,10 +10,11 @@
 /**
  * @group functional
  */
-class phpbb_functional_fileupload_test_remote extends phpbb_functional_test_case
+class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 {
-	protected function setUp()
+	public function setUp()
 	{
+		parent::setUp();
 		// Only doing this within the functional framework because we need a
 		// URL
 
@@ -33,7 +34,7 @@ class phpbb_functional_fileupload_test_remote extends phpbb_functional_test_case
 		$user->lang = new phpbb_mock_lang();
 	}
 
-	protected function tearDown()
+	public function tearDown()
 	{
 		global $config, $user;
 		$user = null;