diff --git a/.gitignore b/.gitignore
index 95c4f7c..f580f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
 *.pyc
 *.sw?
 *~
 .coverage
 .eggs/
 __pycache__
 *.egg-info/
 build
 dist
 version.txt
+.tox
diff --git a/requirements-test.txt b/requirements-test.txt
index 8ae56d8..fc79011 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,4 @@
-nose
+pytest
 apache-libcloud
 azure-storage
 python-cephlibs
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..c926b74
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,16 @@
+[tox]
+envlist=flake8,py3
+
+[testenv:py3]
+deps =
+  -r requirements-test.txt
+  pytest-cov
+commands =
+  pytest --cov=swh --cov-branch {posargs}
+
+[testenv:flake8]
+skip_install = true
+deps =
+  flake8
+commands =
+  {envpython} -m flake8