diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
index c2a3ce5940..9f6e3efb91 100644
--- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
@@ -112,7 +112,7 @@ class release_3_0_5_rc1 extends container_aware_migration
 				// Select auth_option_ids... the largest id will be preserved
 				$sql = 'SELECT auth_option_id
 					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					WHERE auth_option = '" . $this->db->sql_escape($option) . "'
 					ORDER BY auth_option_id DESC";
 				// sql_query_limit not possible here, due to bug in postgresql layer
 				$result = $this->db->sql_query($sql);
diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php
index f00303060d..c014119b98 100644
--- a/tests/functional/prune_shadow_topic_test.php
+++ b/tests/functional/prune_shadow_topic_test.php
@@ -62,7 +62,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas
 		$crawler = self::request('GET', "viewtopic.php?t={$this->post['topic_id']}&sid={$this->sid}");
 
 		$this->assertContains('Prune Shadow #1', $crawler->filter('html')->text());
-		$this->data['topics']['Prune Shadow #1'] = (int) $post['topic_id'];
+		$this->data['topics']['Prune Shadow #1'] = (int) $this->post['topic_id'];
 		$this->data['posts']['Prune Shadow #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
 
 		$this->assert_forum_details($this->data['forums']['Prune Shadow'], array(