diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index f11213be38..b9d55fbd3c 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -27,8 +27,6 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 	public function tearDown()
 	{
-		parent::tearDown();
-
 		$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
 		foreach ($iterator as $fileinfo)
 		{
@@ -44,6 +42,8 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
+
+		parent::tearDown();
 	}
 
 	private function upload_file($filename, $mimetype)
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index 5d935eec59..b170fc051f 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -40,11 +40,11 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 
 	public function tearDown()
 	{
-		parent::tearDown();
-
 		global $config, $user;
 		$user = null;
 		$config = array();
+
+		parent::tearDown();
 	}
 
 	public function test_invalid_extension()
diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index efb5f64f87..c95efc5b2e 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -47,8 +47,6 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 
 	public function tearDown()
 	{
-		parent::tearDown();
-
 		$this->login();
 		$this->admin_login();
 
@@ -59,5 +57,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 			'config[allow_password_reset]'	=> 1,
 		));
 		$crawler = self::submit($form);
+
+		parent::tearDown();
 	}
 }
diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index d0aa8cda68..d9faec035c 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php
@@ -41,8 +41,6 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 
 	public function tearDown()
 	{
-		parent::tearDown();
-
 		$this->set_extension_group_permission(0);
 		$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
 		foreach ($iterator as $fileinfo)
@@ -59,6 +57,8 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
+
+		parent::tearDown();
 	}
 
 	public function get_urls()
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 6ce5d92ee1..5e1cf9b31f 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -117,8 +117,6 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 	protected function tearDown()
 	{
-		parent::tearDown();
-
 		if ($this->db instanceof \phpbb\db\driver\driver_interface)
 		{
 			// Close the database connections again this test
@@ -126,6 +124,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		}
 
 		self::$cookieJar->clear();
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/test_framework/phpbb_mink_test_case.php b/tests/test_framework/phpbb_mink_test_case.php
index 555574e053..86ac9feb09 100644
--- a/tests/test_framework/phpbb_mink_test_case.php
+++ b/tests/test_framework/phpbb_mink_test_case.php
@@ -59,8 +59,8 @@ abstract class phpbb_mink_test_case extends phpbb_test_case
 
 	protected function tearDown()
 	{
-		parent::tearDown();
 		self::$session->reset();
+		parent::tearDown();
 	}
 
 	static protected function visit($path)