diff --git a/tests/Basic/BasicAuthTest.php b/tests/Basic/BasicAuthTest.php
index 644cdb3..ee133c1 100644
--- a/tests/Basic/BasicAuthTest.php
+++ b/tests/Basic/BasicAuthTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class BasicAuthTest extends TestCase
+final class BasicAuthTest extends TestCase
 {
     /**
      * @dataProvider setBasicAuthDataProvider
@@ -20,7 +20,7 @@ public function testSetBasicAuth($user, $pass, $pageText)
         $this->assertStringContainsString($pageText, $session->getPage()->getContent());
     }
 
-    public function setBasicAuthDataProvider()
+    public static function setBasicAuthDataProvider()
     {
         return array(
             array('mink-user', 'mink-password', 'is authenticated'),
diff --git a/tests/Basic/BestPracticesTest.php b/tests/Basic/BestPracticesTest.php
index 9550276..07595a8 100644
--- a/tests/Basic/BestPracticesTest.php
+++ b/tests/Basic/BestPracticesTest.php
@@ -7,7 +7,7 @@
 /**
  * This testcase ensures that the driver implementation follows recommended practices for drivers.
  */
-class BestPracticesTest extends TestCase
+final class BestPracticesTest extends TestCase
 {
     public function testExtendsCoreDriver()
     {
@@ -40,7 +40,7 @@ public function testImplementBasicApi($method)
         $this->assertImplementMethod($method, $driver, 'The driver is unusable when this method is not implemented.');
     }
 
-    public function provideRequiredMethods()
+    public static function provideRequiredMethods()
     {
         return array(
             array('start'),
diff --git a/tests/Basic/ContentTest.php b/tests/Basic/ContentTest.php
index 19609ec..365dd50 100644
--- a/tests/Basic/ContentTest.php
+++ b/tests/Basic/ContentTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class ContentTest extends TestCase
+final class ContentTest extends TestCase
 {
     public function testOuterHtml()
     {
@@ -46,7 +46,7 @@ public function testGetAttribute($attributeName, $attributeValue)
         $this->assertSame($attributeValue, $element->getAttribute($attributeName));
     }
 
-    public function getAttributeDataProvider()
+    public static function getAttributeDataProvider()
     {
         return array(
             array('with-value', 'some-value'),
diff --git a/tests/Basic/CookieTest.php b/tests/Basic/CookieTest.php
index 80b8999..59a2063 100644
--- a/tests/Basic/CookieTest.php
+++ b/tests/Basic/CookieTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class CookieTest extends TestCase
+final class CookieTest extends TestCase
 {
     /**
      * test cookie decoding.
@@ -87,7 +87,7 @@ public function testCookieWithPaths($cookieRemovalMode)
         $this->assertStringContainsString('Previous cookie: NO', $session->getPage()->getText());
     }
 
-    public function cookieWithPathsDataProvider()
+    public static function cookieWithPathsDataProvider()
     {
         return array(
             array('session_reset'),
@@ -123,14 +123,6 @@ public function testCookieInSubPath($cookieRemovalMode)
         $this->assertStringContainsString('Previous cookie: NO', $session->getPage()->getText());
     }
 
-    public function cookieInSubPathProvider()
-    {
-        return array(
-            array('session_reset'),
-            array('cookie_delete'),
-        );
-    }
-
     public function testReset()
     {
         $this->getSession()->visit($this->pathTo('/cookie_page1.php'));
diff --git a/tests/Basic/ErrorHandlingTest.php b/tests/Basic/ErrorHandlingTest.php
index 5a60f45..85945bf 100644
--- a/tests/Basic/ErrorHandlingTest.php
+++ b/tests/Basic/ErrorHandlingTest.php
@@ -7,7 +7,7 @@
 /**
  * @group slow
  */
-class ErrorHandlingTest extends TestCase
+final class ErrorHandlingTest extends TestCase
 {
     const NOT_FOUND_XPATH = '//html/./invalid';
 
diff --git a/tests/Basic/HeaderTest.php b/tests/Basic/HeaderTest.php
index 895ec9e..2d5bdf9 100644
--- a/tests/Basic/HeaderTest.php
+++ b/tests/Basic/HeaderTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class HeaderTest extends TestCase
+final class HeaderTest extends TestCase
 {
     /**
      * test referrer.
diff --git a/tests/Basic/IFrameTest.php b/tests/Basic/IFrameTest.php
index 0ed0f9e..4c7c1a0 100644
--- a/tests/Basic/IFrameTest.php
+++ b/tests/Basic/IFrameTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class IFrameTest extends TestCase
+final class IFrameTest extends TestCase
 {
     public function testIFrame()
     {
diff --git a/tests/Basic/NavigationTest.php b/tests/Basic/NavigationTest.php
index ab5488b..6c67a2c 100644
--- a/tests/Basic/NavigationTest.php
+++ b/tests/Basic/NavigationTest.php
@@ -5,7 +5,7 @@
 use Behat\Mink\Tests\Driver\TestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
-class NavigationTest extends TestCase
+final class NavigationTest extends TestCase
 {
     use AssertionRenames;
 
diff --git a/tests/Basic/ScreenshotTest.php b/tests/Basic/ScreenshotTest.php
index 84f55d0..9fa3f92 100644
--- a/tests/Basic/ScreenshotTest.php
+++ b/tests/Basic/ScreenshotTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class ScreenshotTest extends TestCase
+final class ScreenshotTest extends TestCase
 {
     public function testScreenshot()
     {
diff --git a/tests/Basic/StatusCodeTest.php b/tests/Basic/StatusCodeTest.php
index 2e69dc7..3fc7715 100644
--- a/tests/Basic/StatusCodeTest.php
+++ b/tests/Basic/StatusCodeTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class StatusCodeTest extends TestCase
+final class StatusCodeTest extends TestCase
 {
     public function testStatuses()
     {
diff --git a/tests/Basic/TraversingTest.php b/tests/Basic/TraversingTest.php
index bfa6354..d35ee3d 100644
--- a/tests/Basic/TraversingTest.php
+++ b/tests/Basic/TraversingTest.php
@@ -5,7 +5,7 @@
 use Behat\Mink\Tests\Driver\TestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
-class TraversingTest extends TestCase
+final class TraversingTest extends TestCase
 {
     use AssertionRenames;
 
diff --git a/tests/Basic/VisibilityTest.php b/tests/Basic/VisibilityTest.php
index bb5634e..5c33dcb 100644
--- a/tests/Basic/VisibilityTest.php
+++ b/tests/Basic/VisibilityTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class VisibilityTest extends TestCase
+final class VisibilityTest extends TestCase
 {
     public function testVisibility()
     {
diff --git a/tests/Css/HoverTest.php b/tests/Css/HoverTest.php
index 87041d4..0b3833c 100644
--- a/tests/Css/HoverTest.php
+++ b/tests/Css/HoverTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class HoverTest extends TestCase
+final class HoverTest extends TestCase
 {
     /**
      * @group mouse-events
diff --git a/tests/Form/CheckboxTest.php b/tests/Form/CheckboxTest.php
index cf0bdd8..f5d0e9d 100644
--- a/tests/Form/CheckboxTest.php
+++ b/tests/Form/CheckboxTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class CheckboxTest extends TestCase
+final class CheckboxTest extends TestCase
 {
     public function testManipulate()
     {
diff --git a/tests/Form/GeneralTest.php b/tests/Form/GeneralTest.php
index 136974a..02558d2 100644
--- a/tests/Form/GeneralTest.php
+++ b/tests/Form/GeneralTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class GeneralTest extends TestCase
+final class GeneralTest extends TestCase
 {
     // test multiple submit buttons
     public function testIssue212()
@@ -76,7 +76,7 @@ public function testFormSubmitWays($submitVia)
         }
     }
 
-    public function formSubmitWaysDataProvider()
+    public static function formSubmitWaysDataProvider()
     {
         return array(
             array('Save'),
diff --git a/tests/Form/Html5Test.php b/tests/Form/Html5Test.php
index 75cca20..24216e3 100644
--- a/tests/Form/Html5Test.php
+++ b/tests/Form/Html5Test.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class Html5Test extends TestCase
+final class Html5Test extends TestCase
 {
     public function testHtml5FormInputAttribute()
     {
diff --git a/tests/Form/RadioTest.php b/tests/Form/RadioTest.php
index fab10f4..d3f381d 100644
--- a/tests/Form/RadioTest.php
+++ b/tests/Form/RadioTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class RadioTest extends TestCase
+final class RadioTest extends TestCase
 {
     /**
      * @before
diff --git a/tests/Form/SelectTest.php b/tests/Form/SelectTest.php
index 9a491df..aad5b88 100644
--- a/tests/Form/SelectTest.php
+++ b/tests/Form/SelectTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class SelectTest extends TestCase
+final class SelectTest extends TestCase
 {
     public function testMultiselect()
     {
@@ -77,7 +77,7 @@ public function testElementSelectedStateCheck($selectName, $optionValue, $option
         $this->assertTrue($option->isSelected());
     }
 
-    public function elementSelectedStateCheckDataProvider()
+    public static function elementSelectedStateCheckDataProvider()
     {
         return array(
             array('select_number', '30', 'thirty'),
diff --git a/tests/Js/ChangeEventTest.php b/tests/Js/ChangeEventTest.php
index 8ff837d..fe1b694 100644
--- a/tests/Js/ChangeEventTest.php
+++ b/tests/Js/ChangeEventTest.php
@@ -7,7 +7,7 @@
 /**
  * @group slow
  */
-class ChangeEventTest extends TestCase
+final class ChangeEventTest extends TestCase
 {
     /**
      * 'change' event should be fired after selecting an <option> in a <select>.
@@ -58,7 +58,7 @@ public function testSetValueChangeEvent($elementId, $valueForEmpty, $valueForFil
         }
     }
 
-    public function setValueChangeEventDataProvider()
+    public static function setValueChangeEventDataProvider()
     {
         $file1 = __DIR__ . '/../../web-fixtures/file1.txt';
         $file2 = __DIR__ . '/../../web-fixtures/file2.txt';
@@ -90,7 +90,7 @@ public function testSelectOptionChangeEvent($elementId, $elementValue)
         $this->assertElementChangeCount($elementId);
     }
 
-    public function selectOptionChangeEventDataProvider()
+    public static function selectOptionChangeEventDataProvider()
     {
         return array(
             'select' => array('the-select', '30'),
@@ -140,7 +140,7 @@ public function testUncheckChangeEvent($useSetValue)
         $this->assertElementChangeCount('the-checked-checkbox');
     }
 
-    public function checkboxTestWayDataProvider()
+    public static function checkboxTestWayDataProvider()
     {
         return array(
             array(true),
diff --git a/tests/Js/EventsTest.php b/tests/Js/EventsTest.php
index 537c99d..d1c52fe 100644
--- a/tests/Js/EventsTest.php
+++ b/tests/Js/EventsTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class EventsTest extends TestCase
+final class EventsTest extends TestCase
 {
     /**
      * @group mouse-events
@@ -114,7 +114,7 @@ public function testKeyboardEvents($modifier, $eventProperties)
         $this->assertEquals('key upped:78 / '.$eventProperties, $event->getText());
     }
 
-    public function provideKeyboardEventsModifiers()
+    public static function provideKeyboardEventsModifiers()
     {
         return array(
             'none' => array(null, '0 / 0 / 0 / 0'),
diff --git a/tests/Js/JavascriptEvaluationTest.php b/tests/Js/JavascriptEvaluationTest.php
index ba33e0a..c9cfbcf 100644
--- a/tests/Js/JavascriptEvaluationTest.php
+++ b/tests/Js/JavascriptEvaluationTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class JavascriptEvaluationTest extends TestCase
+final class JavascriptEvaluationTest extends TestCase
 {
     /**
      * Tests, that `wait` method returns check result after exit.
@@ -55,7 +55,7 @@ public function testExecuteScript($script)
         $this->assertEquals('Hello world', $heading->getText());
     }
 
-    public function provideExecutedScript()
+    public static function provideExecutedScript()
     {
         return array(
             array('document.querySelector("h1").textContent = "Hello world"'),
@@ -77,7 +77,7 @@ public function testEvaluateJavascript($script)
         $this->assertSame(2, $this->getSession()->evaluateScript($script));
     }
 
-    public function provideEvaluatedScript()
+    public static function provideEvaluatedScript()
     {
         return array(
             array('1 + 1'),
diff --git a/tests/Js/JavascriptTest.php b/tests/Js/JavascriptTest.php
index 36e9846..ccb430e 100644
--- a/tests/Js/JavascriptTest.php
+++ b/tests/Js/JavascriptTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class JavascriptTest extends TestCase
+final class JavascriptTest extends TestCase
 {
     public function testAriaRoles()
     {
diff --git a/tests/Js/WindowTest.php b/tests/Js/WindowTest.php
index 998db8c..ff64599 100644
--- a/tests/Js/WindowTest.php
+++ b/tests/Js/WindowTest.php
@@ -4,7 +4,7 @@
 
 use Behat\Mink\Tests\Driver\TestCase;
 
-class WindowTest extends TestCase
+final class WindowTest extends TestCase
 {
     public function testWindow()
     {