diff --git a/.gitignore b/.gitignore
index f3d74a9..575c2e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.pyc
 *~
+.coverage
+tests/tmp.db
diff --git a/.travis.yml b/.travis.yml
index 23ca7e5..eb5e84d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,10 @@ python:
   - 2.7
   - 3.3
   - 3.4
+  - 3.5
 install:
-  - pip install git+https://github.com/chfw/pyexcel-io.git  
-  - pip install git+https://github.com/chfw/pyexcel.git
-  - pip install git+https://github.com/chfw/pyexcel-webio.git
-  - pip install git+https://github.com/chfw/pyexcel-xls.git
-  - pip install git+https://github.com/chfw/pyexcel-xlsx.git 
-  - pip install git+https://github.com/T0ha/ezodf.git
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi
-  - pip install git+https://github.com/chfw/pyexcel-ods3.git 
-  - pip install -r tests/requirements.txt --use-mirrors
+  - pip install -r tests/requirements.txt
 script:
   make test
 after_success:
diff --git a/setup.py b/setup.py
index 699eb10..1aa0231 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,14 @@
     'pyexcel-webio>=0.0.3',
     'Flask>=0.10.1'
 ]
+extras = {
+    'xls': ['pyexcel-xls>=0.0.7'],
+    'xlsx': ['pyexcel-xlsx>=0.0.7'],
+    'ods3': [
+        'pyexcel-ods3>=0.0.8',
+        'https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip',
+    ],
+}
 
 setup(
     name='Flask-Excel',
@@ -22,6 +30,7 @@
     url="https://github.com/chfw/Flask-Excel",
     description='A flask extension that provides one application programming interface to read and write data in different excel file formats',
     install_requires=dependencies,
+    extras_require=extras,
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     include_package_data=True,
     long_description=README_txt,
diff --git a/tests/requirements.txt b/tests/requirements.txt
index a4d37da..a2cf10d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -5,6 +5,11 @@ rednose
 nose-cov
 python-coveralls
 coverage
-pyexcel-xls
-pyexcel-xlsx
+pyexcel>=0.1.7
+pyexcel-io>=0.0.8
+pyexcel-ods3>=0.0.8
+pyexcel-webio>=0.0.3
+pyexcel-xls>=0.0.7
+pyexcel-xlsx>=0.0.7
+https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip
 lxml