diff --git a/.travis.yml b/.travis.yml
index 5c130d0..e0d4937 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,21 @@
 language: python
 
+python:
+  - 2.7
+
+before_install:
+  - wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+
 install:
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION atlas numpy scipy matplotlib
+  - source activate test-environment
+  - conda install -c anaconda flake8=2.5.1
   - pip install -r requirements.txt
   - pip install coveralls
   - python setup.py develop
@@ -9,6 +24,6 @@ script:
   - flake8 .
   - coverage run -m unittest discover
   - coverage report
-
+  
 after_success:
   - coveralls
\ No newline at end of file
diff --git a/setup.py b/setup.py
index b45d701..af0e8fc 100644
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,5 @@
     long_description=README_TEXT,
     install_requires=INSTALL_REQUIRES,
     packages=find_packages(),
-    entry_points={'simphony': ['tools = tools']}, 
+    entry_points={'simphony': ['tools = tools']},
 )