diff --git a/.travis.yml b/.travis.yml
index 4d62053db..e97406f77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,42 +3,25 @@
 language: python
 
 python:
-#    - "pypy" # not supported by odoo 8
-#    - "3.4"  # not supported by odoo 8
-#    - "3.3"  # not supported by odoo 8
     - "2.7"
-#    - "2.6"  # not supported by odoo 8
 
 env:
-    - ODOO="https://github.com/savoirfairelinux/odoo/archive/setuptools-addons.tar.gz"  # Temp until https://github.com/odoo/odoo/issues/185 or https://github.com/odoo/odoo/issues/441 is fixed
-#    - ODOO="https://github.com/odoo/odoo/archive/master.tar.gz"
-#    - ODOO="https://github.com/OCA/OCB/archive/master.zip"
+  - VERSION="8.0" ODOO_REPO="odoo/odoo"
+  - VERSION="8.0" ODOO_REPO="OCA/OCB"
 
-# Need coveralls for coverage reports
-# Need flake8 for pep8 testing
-# Manually get PyChart
-# Install tested version of odoo (official or ocb)
-# Get modules from other repos which have dependencies (in this case travel requires modules from lp:partner-contact-management and lp:openerp-hr
-install: 
-    - pip install coveralls flake8
-    - pip install http://download.gna.org/pychart/PyChart-1.39.tar.gz
-    - pip install ${ODOO}
+virtualenv:
+  system_site_packages: true
 
-# Create databae
-# Pre-install modules and dependencies
-before_script: 
-    - createdb test
+install:
+  - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
+  - travis_install_nightly
+  - git clone https://github.com/OCA/stock-logistics-tracking -b ${VERSION} $HOME/stock-logistics-tracking
+  - git clone https://github.com/OCA/stock-logistics-barcode -b ${VERSION} $HOME/stock-logistics-barcode
 
-# Test with flake, ignore F401 for __init__.py files, use a max length of 120
-# Run tests with coverage
-# Only test modules in repo (list populated by directories in repo)
-# Preload modules before testing to only run tests of repo's modules
-# Include current directory and dependent repos in addons-path as well as official addons
 script:
-    - flake8 . --max-line-length=120 --filename=__init__.py --ignore=F401
-    - flake8 . --max-line-length=120 --exclude=__init__.py
-    - odoo.py -d test --stop-after-init --init=$(python -c 'import os; print(",".join(x for x in os.listdir(".") if os.path.isdir(x) and not x.startswith(".") and not x.endswith(".unported")))') --addons-path=$(pwd),`python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`/addons
-    - coverage run $(which odoo.py) -d test --test-enable --log-level=test --stop-after-init --init=$(python -c 'import os; print(",".join(x for x in os.listdir(".") if os.path.isdir(x) and not x.startswith(".") and not x.endswith("_unported")))') --addons-path=$(pwd),`python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`/addons
+    - travis_run_flake8
+    - travis_run_tests
 
 after_success:
   coveralls