diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index 7eed292052..d96092efb2 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -83,7 +83,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 
 		// Download attachment as guest
-		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -141,7 +141,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		$this->add_lang('viewtopic');
 
 		// No download attachment as guest
-		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
 		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
 
@@ -149,7 +149,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		$this->login();
 
 		// Download attachment as admin
-		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -208,7 +208,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		$this->add_lang('viewtopic');
 
 		// No download attachment as guest
-		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
 		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
 
@@ -216,7 +216,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		$this->login();
 
 		// Download attachment as admin
-		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
+		$crawler = self::request('GET', "download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
 		$content = self::$client->getResponse()->getContent();
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index 159703744f..3651134c61 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -1417,7 +1417,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
 					foreach ($attachments as $i => $attachment)
 					{
-						$url = self::$root_url . "download/file.php?id={$attachment['id']}";
+						$url = self::$root_url . "download/attachment/{$attachment['id']}";
 						$string = "Attachment #{$i}";
 
 						if ($attachment['displayed'])