diff --git a/src/Selector/ExactNamedSelector.php b/src/Selector/ExactNamedSelector.php
index 03315a9cf..aac319f78 100644
--- a/src/Selector/ExactNamedSelector.php
+++ b/src/Selector/ExactNamedSelector.php
@@ -23,6 +23,7 @@ public function __construct()
         $this->registerReplacement('%altMatch%', './@alt = %locator%');
         $this->registerReplacement('%relMatch%', './@rel = %locator%');
         $this->registerReplacement('%labelAttributeMatch%', './@label = %locator%');
+        $this->registerReplacement('%ariaLabelAttributeMatch%', './@aria-label = %locator%');
 
         parent::__construct();
     }
diff --git a/src/Selector/NamedSelector.php b/src/Selector/NamedSelector.php
index b5d3e722e..5c4a19225 100644
--- a/src/Selector/NamedSelector.php
+++ b/src/Selector/NamedSelector.php
@@ -46,7 +46,7 @@ class NamedSelector implements SelectorInterface
         '%fieldFilterWithoutPlaceholder%' => 'self::input[%inputTypeWithoutPlaceholderFilter%] | self::select',
         '%buttonTypeFilter%' => "%lowercaseType% = 'submit' or %lowercaseType% = 'image' or %lowercaseType% = 'button' or %lowercaseType% = 'reset'",
         '%notFieldTypeFilter%' => "not(%buttonTypeFilter% or %lowercaseType% = 'hidden')",
-        '%buttonMatch%' => '%idOrNameMatch% or %valueMatch% or %titleMatch%',
+        '%buttonMatch%' => '%idOrNameMatch% or %valueMatch% or %titleMatch% or %ariaLabelAttributeMatch%',
         '%linkMatch%' => '(%idMatch% or %tagTextMatch% or %titleMatch% or %relMatch%)',
         '%imgAltMatch%' => './/img[%altMatch%]',
     );
@@ -99,16 +99,16 @@ class NamedSelector implements SelectorInterface
 [./@href][(%linkMatch% or %imgAltMatch%)]
 |
 .//input
-[%buttonTypeFilter%][(%idOrValueMatch% or %titleMatch%)]
+[%buttonTypeFilter%][(%idOrValueMatch% or %titleMatch% or %ariaLabelAttributeMatch%)]
 |
 .//input
 [%lowercaseType% = 'image'][%altMatch%]
 |
 .//button
-[(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
+[(%idOrValueMatch% or %titleMatch% or %tagTextMatch% or %ariaLabelAttributeMatch%)]
 |
 .//*
-[(%lowercaseRole% = 'button' or %lowercaseRole% = 'link')][(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
+[(%lowercaseRole% = 'button' or %lowercaseRole% = 'link')][(%idOrValueMatch% or %titleMatch% or %tagTextMatch% or %ariaLabelAttributeMatch%)]
 XPATH
 
         ,'content' => <<<XPATH
diff --git a/src/Selector/PartialNamedSelector.php b/src/Selector/PartialNamedSelector.php
index b864a2265..958de4f6c 100644
--- a/src/Selector/PartialNamedSelector.php
+++ b/src/Selector/PartialNamedSelector.php
@@ -25,6 +25,7 @@ public function __construct()
         $this->registerReplacement('%altMatch%', 'contains(./@alt, %locator%)');
         $this->registerReplacement('%relMatch%', 'contains(./@rel, %locator%)');
         $this->registerReplacement('%labelAttributeMatch%', 'contains(./@label, %locator%)');
+        $this->registerReplacement('%ariaLabelAttributeMatch%', 'contains(./@aria-label, %locator%)');
 
         parent::__construct();
     }
diff --git a/tests/Selector/NamedSelectorTest.php b/tests/Selector/NamedSelectorTest.php
index 2ef382978..0c9d09e07 100644
--- a/tests/Selector/NamedSelectorTest.php
+++ b/tests/Selector/NamedSelectorTest.php
@@ -130,7 +130,7 @@ public function getSelectorTests()
             'link (without-href) ignored' => array('test.html', 'link', 'bad-link-text', 0),
             'link* (role=link)' => array('test.html', 'link', 'link-role-text', 4, 7),
 
-            'button (input, name/value/title)' => array('test.html', 'button', 'button-text', 25, 42),
+            'button (input, name/value/title/aria-label)' => array('test.html', 'button', 'button-text', 33, 58),
             'button (type=image, with-alt)' => array('test.html', 'button', 'button-alt-text', 1, 2),
             'button (input type=submit, with-id)' => array('test.html', 'button', 'input-submit-button', 1),
             'button (input type=image, with-id)' => array('test.html', 'button', 'input-image-button', 1),
@@ -150,8 +150,8 @@ public function getSelectorTests()
             'link_or_button (without-href) ignored' => array('test.html', 'link_or_button', 'bad-link-text', 0),
             'link_or_button* (role=link)' => array('test.html', 'link_or_button', 'link-role-text', 4, 7),
 
-            // bug in selector: 17 instead of 25 and 34 instead of 42, because 8 buttons with `name` attribute were not matched
-            'link_or_button (input, name/value/title)' => array('test.html', 'link_or_button', 'button-text', 17, 34),
+            // bug in selector: 25 instead of 33 and 50 instead of 58, because 8 buttons with `name` attribute were not matched
+            'link_or_button (input, name/value/title/aria-label)' => array('test.html', 'link_or_button', 'button-text', 25, 50),
             'link_or_button (type=image, with-alt)' => array('test.html', 'link_or_button', 'button-alt-text', 1, 2),
             'link_or_button (input type=submit, with-id)' => array('test.html', 'link_or_button', 'input-submit-button', 1),
             'link_or_button (input type=image, with-id)' => array('test.html', 'link_or_button', 'input-image-button', 1),
diff --git a/tests/Selector/fixtures/test.html b/tests/Selector/fixtures/test.html
index 12bcf8c9c..29f32319a 100644
--- a/tests/Selector/fixtures/test.html
+++ b/tests/Selector/fixtures/test.html
@@ -191,6 +191,25 @@
             <button type="button" title="some button-text"></button>
             <button type="reset" title="some button-text"></button>
 
+            <!-- match buttons by `aria-label` attribute -->
+            <input type="submit" aria-label="button-text"/>
+            <input type="image" aria-label="button-text"/>
+            <input type="button" aria-label="button-text"/>
+            <input type="reset" aria-label="button-text"/>
+            <button type="submit" aria-label="button-text"></button>
+            <button type="image" aria-label="button-text"></button>
+            <button type="button" aria-label="button-text"></button>
+            <button type="reset" aria-label="button-text"></button>
+            <!-- partial match -->
+            <input type="submit" aria-label="some button-text"/>
+            <input type="image" aria-label="some button-text"/>
+            <input type="button" aria-label="some button-text"/>
+            <input type="reset" aria-label="some button-text"/>
+            <button type="submit" aria-label="some button-text"></button>
+            <button type="image" aria-label="some button-text"></button>
+            <button type="button" aria-label="some button-text"></button>
+            <button type="reset" aria-label="some button-text"></button>
+
             <!-- match some buttons by `alt` attribute -->
             <input type="submit" alt="button-alt-text"/>
             <input type="imaGe" alt="button-alt-text"/>