diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php
index 0fc89620..7dd4eaad 100644
--- a/tests/functional/portal_acp_test.php
+++ b/tests/functional/portal_acp_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_announcement_test.php b/tests/functional/portal_announcement_test.php
index 0c2b07dc..05f05be1 100644
--- a/tests/functional/portal_announcement_test.php
+++ b/tests/functional/portal_announcement_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_announcement_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		$this->purge_cache();
diff --git a/tests/functional/portal_birthday_list_test.php b/tests/functional/portal_birthday_list_test.php
index a117d303..fc8010fa 100644
--- a/tests/functional/portal_birthday_list_test.php
+++ b/tests/functional/portal_birthday_list_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_birthday_list_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_link_test.php b/tests/functional/portal_link_test.php
index d4c99509..dde9fe38 100644
--- a/tests/functional/portal_link_test.php
+++ b/tests/functional/portal_link_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_link_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_no_error_test.php b/tests/functional/portal_no_error_test.php
index 37e20c73..4a76937c 100644
--- a/tests/functional/portal_no_error_test.php
+++ b/tests/functional/portal_no_error_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_no_error_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_redirect_test.php b/tests/functional/portal_redirect_test.php
index 6d43a9cf..bcc88e93 100644
--- a/tests/functional/portal_redirect_test.php
+++ b/tests/functional/portal_redirect_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_redirect_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_visit_registered_test.php b/tests/functional/portal_visit_registered_test.php
index 0a7a0f25..ed416f93 100644
--- a/tests/functional/portal_visit_registered_test.php
+++ b/tests/functional/portal_visit_registered_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_visit_registered_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/functional/portal_vote_poll_test.php b/tests/functional/portal_vote_poll_test.php
index 9434f07e..43a8b5ed 100644
--- a/tests/functional/portal_vote_poll_test.php
+++ b/tests/functional/portal_vote_poll_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_portal_vote_poll_test extends \board3\portal\tests\testframework\functional_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/testframework/database_test_case.php b/tests/testframework/database_test_case.php
index fca46759..114ea6d0 100644
--- a/tests/testframework/database_test_case.php
+++ b/tests/testframework/database_test_case.php
@@ -18,7 +18,7 @@ abstract class database_test_case extends \phpbb_database_test_case
 
 	protected $db;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		global $db;
diff --git a/tests/testframework/ui_test_case.php b/tests/testframework/ui_test_case.php
deleted file mode 100644
index 86011a4e..00000000
--- a/tests/testframework/ui_test_case.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- *
- * @package Board3 Portal Testing
- * @copyright (c) Board3 Group ( www.board3.de )
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-namespace board3\portal\tests\testframework;
-
-abstract class ui_test_case extends \phpbb_ui_test_case
-{
-	static protected function setup_extensions()
-	{
-		return array('board3/portal');
-	}
-}
diff --git a/tests/ui/portal_visit_ui_test.php b/tests/ui/portal_visit_ui_test.php
deleted file mode 100644
index 5c98f6de..00000000
--- a/tests/ui/portal_visit_ui_test.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2013 Board3 Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group ui
-*/
-class phpbb_ui_portal_visit_ui_test extends \board3\portal\tests\testframework\ui_test_case
-{
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->purge_cache();
-
-		$this->login();
-		$this->admin_login();
-	}
-
-	public function test_vanilla_board()
-	{
-		$this->visit('app.php/portal');
-	}
-}
diff --git a/tests/unit/acp/move_module_test.php b/tests/unit/acp/move_module_test.php
index d532cb08..04175b78 100644
--- a/tests/unit/acp/move_module_test.php
+++ b/tests/unit/acp/move_module_test.php
@@ -37,7 +37,7 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
 	/** @var \phpbb_mock_request */
 	protected $request;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		global $db, $cache, $phpbb_root_path, $phpEx, $user, $phpbb_container, $request, $template, $table_prefix;
diff --git a/tests/unit/controller/helper_test.php b/tests/unit/controller/helper_test.php
index 31b92c47..47a53675 100644
--- a/tests/unit/controller/helper_test.php
+++ b/tests/unit/controller/helper_test.php
@@ -19,7 +19,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
 
 	static public $redirect = false;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $cache, $phpbb_extension_manager, $phpbb_root_path;
 
diff --git a/tests/unit/controller/main_test.php b/tests/unit/controller/main_test.php
index 8d01ed58..552dce9e 100644
--- a/tests/unit/controller/main_test.php
+++ b/tests/unit/controller/main_test.php
@@ -25,7 +25,7 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx, $table_prefix, $cache;
 
diff --git a/tests/unit/event/listener_test.php b/tests/unit/event/listener_test.php
index a2c2f4ae..16692188 100644
--- a/tests/unit/event/listener_test.php
+++ b/tests/unit/event/listener_test.php
@@ -22,7 +22,7 @@ class listener_test extends \phpbb_template_template_test_case
 
 	static public $hidden_fields = array();
 
-	public function setup()
+	public function setup(): void
 	{
 		parent::setUp();
 
diff --git a/tests/unit/functions/check_file_src_test.php b/tests/unit/functions/check_file_src_test.php
index 1e63bef2..607b4a63 100644
--- a/tests/unit/functions/check_file_src_test.php
+++ b/tests/unit/functions/check_file_src_test.php
@@ -12,7 +12,7 @@ require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
 
 class phpbb_functions_check_file_src_test extends \board3\portal\tests\testframework\database_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		global $phpbb_root_path, $portal_root_path;
 
diff --git a/tests/unit/functions/fetch_news_test.php b/tests/unit/functions/fetch_news_test.php
index 52a3dbf9..8d22d841 100644
--- a/tests/unit/functions/fetch_news_test.php
+++ b/tests/unit/functions/fetch_news_test.php
@@ -15,7 +15,7 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
 {
 	protected $default_main_columns = array('topic_count', 'global_id', 'topic_icons');
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/unit/functions/functions_test.php b/tests/unit/functions/functions_test.php
index a0bd0eae..574faf61 100644
--- a/tests/unit/functions/functions_test.php
+++ b/tests/unit/functions/functions_test.php
@@ -17,7 +17,7 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/styles.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $cache, $user, $phpbb_root_path;
 
diff --git a/tests/unit/functions/get_user_groups_test.php b/tests/unit/functions/get_user_groups_test.php
index a5e53475..7ef421d4 100644
--- a/tests/unit/functions/get_user_groups_test.php
+++ b/tests/unit/functions/get_user_groups_test.php
@@ -14,7 +14,7 @@ class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\tes
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_groups.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $cache, $user, $phpbb_root_path;
 
diff --git a/tests/unit/functions/simple_test.php b/tests/unit/functions/simple_test.php
index 58906d41..65b41e11 100644
--- a/tests/unit/functions/simple_test.php
+++ b/tests/unit/functions/simple_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_functions_simple_test extends PHPUnit_Framework_TestCase
+class phpbb_functions_simple_test extends \PHPUnit\Framework\TestCase
 {
 	public function test_ap_validate()
 	{
diff --git a/tests/unit/includes/helper_test.php b/tests/unit/includes/helper_test.php
index 01c0a4fa..9f98cc7f 100644
--- a/tests/unit/includes/helper_test.php
+++ b/tests/unit/includes/helper_test.php
@@ -13,7 +13,7 @@ class board3_includes_helper_test extends \board3\portal\tests\testframework\tes
 
 	protected $modules;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		$config = new \phpbb\config\config(array());
 		$this->modules = array(
diff --git a/tests/unit/includes/modules_helper_test.php b/tests/unit/includes/modules_helper_test.php
index e55d0edf..40bd3cd2 100644
--- a/tests/unit/includes/modules_helper_test.php
+++ b/tests/unit/includes/modules_helper_test.php
@@ -24,7 +24,7 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/auth.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
diff --git a/tests/unit/modules/birthday_list_test.php b/tests/unit/modules/birthday_list_test.php
index cf583d67..97e0cc46 100644
--- a/tests/unit/modules/birthday_list_test.php
+++ b/tests/unit/modules/birthday_list_test.php
@@ -31,7 +31,7 @@ class phpbb_unit_modules_birthday_list_test extends \board3\portal\tests\testfra
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/users.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $auth, $phpbb_dispatcher, $phpbb_root_path;
 
diff --git a/tests/unit/modules/calendar_test.php b/tests/unit/modules/calendar_test.php
index 3cbfe230..3dafdfeb 100644
--- a/tests/unit/modules/calendar_test.php
+++ b/tests/unit/modules/calendar_test.php
@@ -35,7 +35,7 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/configs.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		global $cache, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $request, $user;
@@ -122,7 +122,7 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
 		{
 			$this->expected_config[$key] = $value;
 		}
-		
+
 		$portal_config = obtain_portal_config();
 
 		foreach ($portal_config as $key => $value)
diff --git a/tests/unit/modules/clock_test.php b/tests/unit/modules/clock_test.php
index 192c072f..9db1bc15 100644
--- a/tests/unit/modules/clock_test.php
+++ b/tests/unit/modules/clock_test.php
@@ -20,7 +20,7 @@ class phpbb_unit_modules_clock_test extends \board3\portal\tests\testframework\t
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/unit/modules/module_base_test.php b/tests/unit/modules/module_base_test.php
index 3f333952..44ac9149 100644
--- a/tests/unit/modules/module_base_test.php
+++ b/tests/unit/modules/module_base_test.php
@@ -12,7 +12,7 @@ class phpbb_unit_modules_module_base_test extends \board3\portal\tests\testframe
 	/** @var \board3\portal\modules\module_base */
 	protected $module_base;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/unit/modules/search_test.php b/tests/unit/modules/search_test.php
index 42715eeb..0bb06998 100644
--- a/tests/unit/modules/search_test.php
+++ b/tests/unit/modules/search_test.php
@@ -17,7 +17,7 @@ class phpbb_unit_modules_search_test extends \board3\portal\tests\testframework\
 	/** @var \board3\portal\modules\search */
 	protected $search;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/unit/modules/welcome_test.php b/tests/unit/modules/welcome_test.php
index b1ff3cf3..ba07fb94 100644
--- a/tests/unit/modules/welcome_test.php
+++ b/tests/unit/modules/welcome_test.php
@@ -35,7 +35,7 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/configs.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		global $cache, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $request, $config, $phpbb_container, $user;
diff --git a/tests/unit/portal/columns_test.php b/tests/unit/portal/columns_test.php
index b9ccf553..b31d215d 100644
--- a/tests/unit/portal/columns_test.php
+++ b/tests/unit/portal/columns_test.php
@@ -11,7 +11,7 @@ class board3_portal_columns_test extends \board3\portal\tests\testframework\test
 {
 	protected $portal_columns;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -64,4 +64,4 @@ class board3_portal_columns_test extends \board3\portal\tests\testframework\test
 	{
 		$this->assertEquals($constant, $this->portal_columns->string_to_constant($string));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/portal/fetch_posts_test.php b/tests/unit/portal/fetch_posts_test.php
index b29ec76e..39fa52f5 100644
--- a/tests/unit/portal/fetch_posts_test.php
+++ b/tests/unit/portal/fetch_posts_test.php
@@ -20,7 +20,7 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
 	protected $default_main_columns = array('topic_count', 'global_id', 'topic_icons');
 	protected $fetch_posts;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $auth, $cache, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $template, $user;
 
diff --git a/tests/unit/portal/modules_manager_confirm_box_test.php b/tests/unit/portal/modules_manager_confirm_box_test.php
index 777eed29..127df79d 100644
--- a/tests/unit/portal/modules_manager_confirm_box_test.php
+++ b/tests/unit/portal/modules_manager_confirm_box_test.php
@@ -37,7 +37,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
 		return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $cache, $db, $portal_config, $phpbb_root_path, $phpEx;
 
diff --git a/tests/unit/portal/modules_manager_test.php b/tests/unit/portal/modules_manager_test.php
index 0f7638bd..81b3ba0c 100644
--- a/tests/unit/portal/modules_manager_test.php
+++ b/tests/unit/portal/modules_manager_test.php
@@ -31,7 +31,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
 		return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $cache, $db, $phpbb_root_path, $phpEx;