2 files changed, 3 insertions, 20 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index bf946df381..302701e3b3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,25 +10,9 @@
 define('IN_PHPBB', true);
 $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
-$table_prefix = 'phpbb_';
-
-if (!defined('E_DEPRECATED'))
-{
-    define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_DEPRECATED);
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require_once $phpbb_root_path . 'includes/startup.php';
 
+$table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
 require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
 
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index ca52d24b7e..b5e6f7e377 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -102,8 +102,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'admin_name'	=> 'admin',
 			'admin_pass1'	=> 'admin',
 			'admin_pass2'	=> 'admin',
-			'board_email1'	=> 'nobody@example.com',
-			'board_email2'	=> 'nobody@example.com',
+			'board_email'	=> 'nobody@example.com',
 		));
 
 		$parseURL = parse_url(self::$config['phpbb_functional_url']);