diff --git a/.travis.yml b/.travis.yml
index 4afe4079..bfd602e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,22 @@
 sudo: required
 language: python
-python: 3.5
-
-services:
-  - docker
+python:
+  - 3.4
+  - 3.5
 
 before_install:
-  - pip install codecov
-  - docker-compose build
+  - source /etc/lsb-release
+  - echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee -a /etc/apt/sources.list.d/rethinkdb.list
+  - wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update -qq
 
-script: docker-compose run --rm bigchaindb py.test -v --cov=bigchaindb
+install:
+  - sudo apt-get install rethinkdb
+  - pip install -e .[test]
+  - pip install codecov
+
+before_script: rethinkdb --daemon
+
+script: py.test -v --cov=bigchaindb
 
 after_success: codecov
diff --git a/README.md b/README.md
index d61f0429..f1f99d2f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # BigchainDB
 
-[![Build Status](https://travis-ci.org/bigchaindb/bigchaindb.svg?branch=develop)](https://travis-ci.org/bigchaindb/bigchaindb)
+[![PyPI](https://img.shields.io/pypi/v/bigchaindb.svg)](https://pypi.python.org/pypi/BigchainDB)
+[![Travis branch](https://img.shields.io/travis/bigchaindb/bigchaindb/develop.svg)](https://travis-ci.org/bigchaindb/bigchaindb)
+[![Codecov branch](https://img.shields.io/codecov/c/github/codecov/bigchaindb/develop.svg)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop)
+[![Documentation Status](https://readthedocs.org/projects/bigchaindb/badge/?version=develop)](http://bigchaindb.readthedocs.org/en/develop/?badge=develop)
 
 ## Documentation
 
diff --git a/requirements/ci.txt b/requirements/ci.txt
deleted file mode 100644
index 18ad1528..00000000
--- a/requirements/ci.txt
+++ /dev/null
@@ -1,9 +0,0 @@
--r common.txt
-
-pytest==2.8.2
-pytest-cov
-coverage
-codecov
-pep8
-pyflakes
-pylint
diff --git a/requirements/common.txt b/requirements/common.txt
deleted file mode 100644
index cf191327..00000000
--- a/requirements/common.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-rethinkdb==2.2.0.post1
-pysha3==0.3
-pytz==2015.7
-cryptography==1.2.1
-statsd==3.2.1
-python-rapidjson==0.0.6
-logstats==0.2.1
-base58==0.2.2
-bitcoin==1.1.42
diff --git a/setup.py b/setup.py
index 0cf0d835..3a3d0e88 100644
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,16 @@ For full docs visit https://bigchaindb.readthedocs.org
 """
 from setuptools import setup
 
+tests_require = [
+    'pytest',
+    'coverage',
+    'pep8',
+    'pyflakes',
+    'pylint',
+    'pytest',
+    'pytest-cov',
+]
+
 setup(
     name='BigchainDB',
     version='0.0.0',
@@ -45,5 +55,6 @@ setup(
         'bitcoin==1.1.42',
     ],
     setup_requires=['pytest-runner'],
-    tests_require=['pytest'],
+    tests_require=tests_require,
+    extras_require={'test': tests_require},
 )
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 3f18618a..00000000
--- a/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[tox]
-skipsdist = true
-envlist = py35
-
-[testenv]
-commands = py.test -v --cov=bigchaindb
-deps = -rrequirements/ci.txt