2 files changed, 5 insertions, 3 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 5127aa7f47..2476cf0c19 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -132,7 +132,9 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 
 			$row_num = str_replace('redirect_expected_', '', $redirect);
 
-			$this->assertContains($filesystem->clean_path(self::$root_url) . $crawler->filter('#redirect_expected_' .  $row_num)->text(), $crawler->filter('#redirect_' . $row_num)->text());
+			$redirect = $crawler->filter('#redirect_' . $row_num)->text();
+			$redirect = substr($redirect, 0, strpos($redirect, 'sid') - 1);
+			$this->assertContains($crawler->filter('#redirect_expected_' .  $row_num)->text(), $redirect);
 		}
 
 		$this->phpbb_extension_manager->purge('foo/bar');
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 48360e3034..24ddaa265d 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -38,9 +38,9 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 			array('./foobar', false, false, 'http://localhost/phpBB/foobar'),
 			array('foo/bar', false, false, 'http://localhost/phpBB/foo/bar'),
 			array('./foo/bar', false, false, 'http://localhost/phpBB/foo/bar'),
-			array('./../index.php', false, false, 'http://localhost/phpBB/index.php'),
+			array('./../index.php', false, false, 'http://localhost/index.php'),
 			array('./../index.php', true, false, 'http://localhost/index.php'),
-			array('../index.php', false, false, 'http://localhost/phpBB/index.php'),
+			array('../index.php', false, false, 'http://localhost/index.php'),
 			array('../index.php', true, false, 'http://localhost/index.php'),
 			array('./index.php', false, false, 'http://localhost/phpBB/index.php'),
 		);