diff --git a/.travis.yml b/.travis.yml
index 32f023adc..04e5345e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,25 @@
 language: python
+
 python:
   - "2.7"
 
+env:
+  - VERSION="7.0" ODOO_REPO="odoo/odoo"
+  - VERSION="7.0" ODOO_REPO="OCA/OCB"
+
 virtualenv:
   system_site_packages: true
 
 install:
- - git clone https://github.com/yvaucher/maintainer-quality-tools.git $HOME/maintainer-quality-tools
- - export PATH=$HOME/maintainer-quality-tools/travis:$PATH
- - travis_install_nightly 7.0
- - pip install coveralls flake8
- - pip install python-ldap
- - printf '[options]\n\nrunning_env = dev' > /tmp/odoo.cfg
+  - 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 ${VERSION}
+  - sudo pip install python-ldap
+  - printf '[options]\n\nrunning_env = dev' > ${HOME}/.openerp_serverrc
 
 script:
-    - travis_run_flake8
-    - travis_run_tests 7.0 /tmp/odoo.cfg
+  - travis_run_flake8
+  - travis_run_tests ${VERSION}
 
 after_success:
   coveralls