diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3d6b642645fb5a208026c249e85d44d5c7c589fe..fc8754567b2f95b7588373ff3f8d46301a9c8f48 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,3 +4,21 @@
     1.1. If it's cool af, you don't have to.
 2. Exhaustive pydoc.
 3. If you introduce any gotchas, document them in [docs/](docs/).
+
+
+## Unit tests
+Tests work using either Travis CI or Vagrant.
+
+If you want to debug things, you have RabbitMQ management enabled on Vagrant. 
+Go to [http://127.0.0.1:15672](http://127.0.0.1:15672) and log in with **user** / **user**
+
+RabbitMQ management is NOT enabled on Travis CI.
+
+If you want to see a coverage report, run tests like this:
+```bash
+nosetests --with-coverage --exe
+coverage html
+```
+*--exe* is for the cases where you run on Windows, and everything in */vagrant* is 777.
+
+and then go to [http://127.0.0.1:8765](http://127.0.0.1:8765)
diff --git a/setup.cfg b/setup.cfg
index 4a6641d594b9176da3f8b3ee44fcd317b700696e..be77f9a4977a5d19c733738ad8992edbff218e8d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,3 +32,10 @@ universal=1
 verbosity=1
 detailed-errors=1
 with-coverage=1
+
+[isort]
+add_imports =
+    from __future__ import absolute_import
+    from __future__ import division
+    from __future__ import print_function
+    from __future__ import unicode_literals
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index ea9d4b8875b01c2f057284b1762636610a42320a..0000000000000000000000000000000000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Tests work using either Travis CI or Vagrant.
-
-If you want to debug things, you have RabbitMQ management enabled on Vagrant. 
-Go to [http://127.0.0.1:15672](http://127.0.0.1:15672) and log in with **user** / **user**
-
-RabbitMQ management is NOT enabled on Travis CI.
-
-If you want to see a coverage report, run tests like this:
-```bash
-nosetests --with-coverage --exe
-coverage html
-```
-*--exe* is for the cases where you run on Windows, and everything in */vagrant* is 777.
-
-and then go to [http://127.0.0.1:8765](http://127.0.0.1:8765)