diff --git a/.travis.yml b/.travis.yml
index b6e97e6..559663c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,17 @@
 language: python
 python:
   - "pypy"
+  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
-  - "2.6"
 # command to install dependencies
 install:
-  - pip install -r requirements.txt
+  - pip install -r requirements-dev.txt
   - pip install coveralls
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install argparse importlib unittest2 astor; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install astor; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install astor; fi
-  - python setup.py -q install
-# # command to run tests
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi  # needs for running tests
+  - pip install --allow-all-external -e .
+# command to run tests
 script: make travis
 after_success: coveralls
 notifications:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index fc712b3..749f5be 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,11 @@
--r requirements.txt
-tox
+# test tools
 nose
+tox
+
+# code quality
+flake8
+coverage
+
+# documentation
 Pygments>=1.6
 Sphinx
-coverage
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index ab8080a..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Check site / dev for more deps!
-flake8
-rply>=0.7.0
diff --git a/tox.ini b/tox.ini
index 44c1903..6c280fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,39 +1,18 @@
 [tox]
-envlist = py27,pypy,py32,py33,py26,flake8
+envlist = py26,py27,pypy,py32,py33,flake8
+skipsdist = True
+
 [testenv]
-commands = nosetests
+commands =
+ pip install --allow-all-external -e .
+ nosetests
 deps =
- nose
- setuptools
- rply
-
-[testenv:pypy]
-commands = nosetests
-deps =
- astor
- nose
- setuptools
- rply
-
-[testenv:py27]
-commands = nosetests
-deps =
- astor
- nose
- setuptools
- rply
+ -rrequirements-dev.txt
 
 [testenv:py26]
 deps =
- astor
- nose
- setuptools
+ {[testenv]deps}
  unittest2
- importlib
- rply
 
 [testenv:flake8]
-deps =
- flake8
- rply
 commands = flake8 hy bin tests