diff --git a/pytest_splinter/decorators.py b/pytest_splinter/decorators.py
deleted file mode 100644
index c65bce1..0000000
--- a/pytest_splinter/decorators.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""Decorators."""
-import inspect
-from functools import wraps
-
-
-def with_fixtures(func):
-    """A decorator that allows to call a function with the with_fixtures as parameters.
-
-    :returns: Function that takes request parameter and optional keyword arguments to override fixtures.
-    """
-    @wraps(func)
-    def decorate(request, **kwargs):
-        call_args = {}
-        for arg in inspect.getargspec(func).args:
-            if arg in kwargs:
-                call_args[arg] = kwargs[arg]
-            else:
-                call_args[arg] = request.getfuncargvalue(arg)
-        return func(**call_args)
-    return decorate
diff --git a/requirements-testing.txt b/requirements-testing.txt
index d5d0420..2ced7be 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -4,3 +4,4 @@ pytest-localserver
 pylama
 pylama_pylint
 astroid>=1.4.5
+selenium<3
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 379301d..694a009 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands=
 basepython=python2.7
 deps =
     {[testenv]deps}
-    hg+https://bitbucket.org/pytest-dev/py#egg=py
+    git+https://github.com/pytest-dev/py.git@master#egg=py
     git+https://github.com/pytest-dev/pytest.git@features#egg=pytest
 
 [pytest]
@@ -46,7 +46,7 @@ addopts = -vvl -r w
 format = pep8
 skip = */.tox/*,*/.env/*
 linters = pylint,mccabe,pep8,pep257
-ignore = F0401,C0111,E731,D100,W0621,W0108,R0201,W0401,W0614,W0212,C901,R0914,D211
+ignore = F0401,C0111,E731,D100,W0621,W0108,R0201,W0401,W0614,W0212,C901,R0914,D211,D213,D403
 
 [pylama:pep8]
 max_line_length = 120