diff --git a/lib/behat/classes/behat_selectors.php b/lib/behat/classes/behat_selectors.php
index 85dde956af4..e38b2dbb225 100644
--- a/lib/behat/classes/behat_selectors.php
+++ b/lib/behat/classes/behat_selectors.php
@@ -110,6 +110,9 @@ XPATH
         , 'filemanager' => <<<XPATH
 //div[contains(concat(' ', normalize-space(@class), ' '), ' ffilemanager ')]
     /descendant::input[@id = //label[contains(normalize-space(string(.)), %locator%)]/@for]
+XPATH
+        , 'table' => <<<XPATH
+.//table[(./@id = %locator% or contains(.//caption, %locator%) or contains(concat(' ', normalize-space(@class), ' '), %locator% ))]
 XPATH
     );