5 files changed, 7 insertions, 20 deletions
diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 7af8051417..52a7b14f40 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_mysql';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('MySQL search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php
index ce568df616..512c6f2830 100644
--- a/tests/functional/search/native_test.php
+++ b/tests/functional/search/native_test.php
@@ -15,9 +15,4 @@ require_once dirname(__FILE__) . '/base.php';
 class phpbb_functional_search_native_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_native';
-
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Native search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 487b8aeebb..974b417659 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_postgres';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Postgres search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index 18c6df2445..4911160cc0 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -106,17 +106,17 @@ class phpbb_search_native_test extends phpbb_search_test_case
 			array(
 				'-foo',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1),
 				array(),
 			),
 			array(
 				'-foo -bar',
 				'all',
-				false,
-				null,
-				null,
+				true,
+				array(),
+				array(1, 2),
 				array(),
 			),
 			// all common
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index bc1bebd87a..32aa234316 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compatibility.php';
 
 class phpbb_security_hash_test extends phpbb_test_case
 {