diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php
index 1dcd013fae..bf37fc7203 100644
--- a/tests/functional/acp_test.php
+++ b/tests/functional/acp_test.php
@@ -25,6 +25,7 @@ class phpbb_functional_acp_test extends phpbb_functional_test_case
 		// Browse ACP main page
 		$crawler = self::request('GET', 'index.php');
 		$crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link());
+		self::assert_response_html();
 
 		// Get all ACP module URLs array
 		$acp_modules = $crawler->filter('li.tab a')->each(
@@ -37,24 +38,28 @@ class phpbb_functional_acp_test extends phpbb_functional_test_case
 				}
 			}
 		);
+		$this->assertNotEmpty($acp_modules);
 
 		// Browse all ACP modules and get their mode URLs array
 		$acp_submodules = [];
 		foreach ($acp_modules as $module)
 		{
 			$crawler = self::$client->click($module);
-			$acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu_block li a')->each(
+			self::assert_response_html();
+			$acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu-block li a')->each(
 				function ($node, $i)
 				{
 					return $node->link();
 				}
 			));
 		}
+		$this->assertNotEmpty($acp_submodules);
 
 		// Browse all ACP submodules' modes
 		foreach ($acp_submodules as $acp_submodule)
 		{
 			self::$client->click($acp_submodule);
+			self::assert_response_html();
 		}
 	}
 }
diff --git a/tests/functional/mcp/mcp_test.php b/tests/functional/mcp/mcp_test.php
index ff8dff4564..b2d8fd6cac 100644
--- a/tests/functional/mcp/mcp_test.php
+++ b/tests/functional/mcp/mcp_test.php
@@ -24,6 +24,7 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case
 		// Browse MCP main page
 		$crawler = self::request('GET', 'index.php');
 		$crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link());
+		self::assert_response_html();
 
 		// Get all MCP module URLs array
 		$mcp_modules = $crawler->filter('.tabs a')->each(
@@ -32,12 +33,14 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case
 				return $node->link();
 			}
 		);
+		$this->assertNotEmpty($mcp_modules);
 
 		// Browse all MCP modules and get their mode URLs array
 		$mcp_submodules = [];
 		foreach ($mcp_modules as $module)
 		{
 			$crawler = self::$client->click($module);
+			self::assert_response_html();
 			$mcp_submodules = array_merge($mcp_submodules, $crawler->filter('.cp-menu a')->each(
 				function ($node, $i)
 				{
@@ -45,11 +48,13 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case
 				}
 			));
 		}
+		$this->assertNotEmpty($mcp_submodules);
 
 		// Browse all MCP submodules' modes
 		foreach ($mcp_submodules as $mcp_submodule)
 		{
 			self::$client->click($mcp_submodule);
+			self::assert_response_html();
 		}
 	}
 }