diff --git a/Makefile b/Makefile
index 22cb448..9ed3652 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,12 @@ VENV = $(shell python -c "import sys; print(int(hasattr(sys, 'real_prefix')));")
 # Python commands
 ifeq ($(VENV),1)
 	COVERALLS = coveralls
+	PYTHON = python
 	SPHINXBUILD = sphinx-build
-	TOX = tox
-	TWINE = twine
 else
 	COVERALLS = $(ENV)/bin/coveralls
+	PYTHON = $(ENV)/bin/python
 	SPHINXBUILD = `pwd`/$(ENV)/bin/sphinx-build
-	TOX = $(ENV)/bin/tox
-	TWINE = $(ENV)/bin/twine
 endif
 
 # Bootstrapper args
@@ -52,7 +50,7 @@ ifeq ($(CIRCLECI),)
 endif
 	rm -rf build/ dist/
 	python setup.py sdist bdist_wheel
-	$(TWINE) upload dist/*
+	$(PYTHON) -m twine upload dist/*
 
 distclean: clean
 	rm -rf build/ dist/ *.egg*/ $(ENV)/
@@ -62,18 +60,21 @@ docs: .install
 
 install: .install
 .install: setup.py requirements-dev.txt
-	bootstrapper -d -e $(ENV)/ $(bootstrapper_args)
+	python -m bootstrapper -r requirements-dev.txt -e $(ENV)/ $(bootstrapper_args)
 	touch $@
 
 lint:
 	TOXENV=lint $(MAKE) test
 
+list-outdated: .install
+	$(PYTHON) -m pip list -lo
+
 setup-pyenv:
 ifneq ($(CIRCLECI),)
 	pyenv local 3.5.3 3.6.2
 else
-	pyenv local 3.5.4 3.6.3
+	pyenv local 3.5.4 3.6.4
 endif
 
 test: .install clean
-	$(TOX) $(tox_args) $(TOX_ARGS) -- $(TEST_ARGS)
+	$(PYTHON) -m tox $(tox_args) $(TOX_ARGS) -- $(TEST_ARGS)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4f5b0f5..fc893ce 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 coveralls==1.2.0
 Sphinx==1.6.6
-sphinx-autodoc-typehints==1.2.3
+sphinx-autodoc-typehints==1.2.4
 tox==2.9.1
 tox-pyenv==1.1.0
 twine==1.9.1
diff --git a/tox.ini b/tox.ini
index 03bff59..6a09548 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,13 +12,15 @@ deps =
     aiohttp20: aiohttp==2.0.7
     aiohttp21: aiohttp==2.1.0
     aiohttp22: aiohttp==2.2.5
-    aiohttp23: aiohttp==2.3.7
+    aiohttp22: yarl==0.18.0
+    aiohttp23: aiohttp==2.3.10
     aiohttp23: async_timeout==2.0.0
-    coverage==4.4.2
+    coverage==4.5
     fastjsonschema==1.1
     jsl==0.2.4
     jsonschema==2.6.0
-    pytest==3.2.3
+    py35: pytest==3.2.3
+    py36: pytest==3.4.0
     pytest-aiohttp==0.1.3
     pytest-cov==2.5.1
 passenv =