diff --git a/.readthedocs.yml b/.readthedocs.yml
index a53add7..720be39 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,8 +1,16 @@
 version: 2
+
+build:
+  image: stable
+
 conda:
   environment: environment.yml
+  
 python:
-  version: 3
+  system_packages: true
   install:
     - method: pip
       path: .
+      extra_requirements:
+         - doc
+         - fancy_progressbar
diff --git a/.travis.yml b/.travis.yml
index 68f588c..6fcf6cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,12 @@ install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda config --append channels conda-forge
-  - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
 
   - conda env create -f ./environment.yml
-  - source activate test-environment
-  - python setup.py install
+  - source activate filter_functions
+  - pip install .[fancy_progressbar,doc,tests]
 
 script:
   - "coverage run --rcfile=coverage.ini -m pytest"
diff --git a/environment.yml b/environment.yml
index 375fc5b..b07179c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,150 +1,11 @@
-name: test-environment
+name: filter_functions
+
 channels:
   - conda-forge
-  - defaults
+
 dependencies:
-  - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=0_gnu
-  - alabaster=0.7.12=py_0
-  - atomicwrites=1.3.0=py_0
-  - attrs=19.3.0=py_0
-  - babel=2.8.0=py_0
-  - backcall=0.1.0=py_0
-  - bleach=3.1.0=py_0
-  - ca-certificates=2019.11.28=hecc5488_0
-  - certifi=2019.11.28=py37_0
-  - cffi=1.13.2=py37h8022711_0
-  - chardet=3.0.4=py37_1003
-  - coverage=5.0.3=py37h516909a_0
-  - coveralls=1.10.0=py_0
-  - cryptography=2.8=py37h72c5cf5_1
-  - cycler=0.10.0=py_2
-  - cython=0.29.14=py37he1b5a44_0
-  - dbus=1.13.6=he372182_0
-  - decorator=4.4.1=py_0
-  - defusedxml=0.6.0=py_0
-  - docopt=0.6.2=py_1
-  - docutils=0.16=py37_0
-  - entrypoints=0.3=py37_1000
-  - expat=2.2.5=he1b5a44_1004
-  - fontconfig=2.13.1=h86ecdb6_1001
-  - freetype=2.10.0=he983fc9_1
-  - gettext=0.19.8.1=hc5be6a0_1002
-  - glib=2.58.3=py37h6f030ca_1002
-  - gst-plugins-base=1.14.5=h0935bb2_0
-  - gstreamer=1.14.5=h36ae1b5_0
-  - icu=64.2=he1b5a44_1
-  - idna=2.8=py37_1000
-  - imagesize=1.2.0=py_0
-  - importlib_metadata=1.4.0=py37_0
-  - ipykernel=5.1.3=py37h5ca1d4c_0
-  - ipython=7.11.1=py37h5ca1d4c_0
-  - ipython_genutils=0.2.0=py_1
-  - jedi=0.15.2=py37_0
-  - jinja2=2.10.3=py_0
-  - jpeg=9c=h14c3975_1001
-  - jsonschema=3.2.0=py37_0
-  - jupyter_client=5.3.4=py37_1
-  - jupyter_core=4.6.1=py37_0
-  - kiwisolver=1.1.0=py37hc9558a2_0
-  - ld_impl_linux-64=2.33.1=h53a641e_7
-  - libblas=3.8.0=14_openblas
-  - libcblas=3.8.0=14_openblas
-  - libclang=9.0.1=default_hde54327_0
-  - libffi=3.2.1=he1b5a44_1006
-  - libgcc-ng=9.2.0=h24d8f2e_2
-  - libgfortran-ng=7.3.0=hdf63c60_4
-  - libgomp=9.2.0=h24d8f2e_2
-  - libiconv=1.15=h516909a_1005
-  - liblapack=3.8.0=14_openblas
-  - libllvm8=8.0.1=hc9558a2_0
-  - libllvm9=9.0.1=hc9558a2_0
-  - libopenblas=0.3.7=h5ec1e0e_6
-  - libpng=1.6.37=hed695b0_0
-  - libsodium=1.0.17=h516909a_0
-  - libstdcxx-ng=9.2.0=hdf63c60_2
-  - libuuid=2.32.1=h14c3975_1000
-  - libxcb=1.13=h14c3975_1002
-  - libxkbcommon=0.9.1=hebb1f50_0
-  - libxml2=2.9.10=hee79883_0
-  - llvmlite=0.31.0=py37h8b12597_0
-  - markupsafe=1.1.1=py37h516909a_0
-  - matplotlib=3.1.2=py37_1
-  - matplotlib-base=3.1.2=py37h250f245_1
-  - mistune=0.8.4=py37h516909a_1000
-  - more-itertools=8.1.0=py_0
-  - nbconvert=5.6.1=py37_0
-  - nbformat=5.0.3=py_0
-  - nbsphinx=0.5.0=py_0
-  - ncurses=6.1=hf484d3e_1002
-  - nspr=4.24=he1b5a44_0
-  - nss=3.47=he751ad9_0
-  - numba=0.47.0=py37hb3f55d8_0
-  - numpy=1.17.5=py37h95a1406_0
-  - numpydoc=0.9.2=py_0
-  - openssl=1.1.1d=h516909a_0
-  - opt_einsum=3.1.0=py_0
-  - packaging=20.0=py_0
-  - pandoc=2.9.1.1=0
-  - pandocfilters=1.4.2=py_1
-  - parso=0.5.2=py_0
-  - pcre=8.43=he1b5a44_0
-  - pexpect=4.7.0=py37_0
-  - pickleshare=0.7.5=py37_1000
-  - pip=19.3.1=py37_0
-  - pluggy=0.13.0=py37_0
-  - prompt_toolkit=3.0.2=py_0
-  - pthread-stubs=0.4=h14c3975_1001
-  - ptyprocess=0.6.0=py_1001
-  - py=1.8.1=py_0
-  - pycparser=2.19=py37_1
-  - pygments=2.5.2=py_0
-  - pyopenssl=19.1.0=py37_0
-  - pyparsing=2.4.6=py_0
-  - pyqt=5.12.3=py37hcca6a23_1
-  - pyrsistent=0.15.7=py37h516909a_0
-  - pysocks=1.7.1=py37_0
-  - pytest=5.0.1=py37_0
-  - python=3.7.6=h357f687_2
-  - python-dateutil=2.8.1=py_0
-  - pytz=2019.3=py_0
-  - pyyaml=5.3=py37h516909a_0
-  - pyzmq=18.1.1=py37h1768529_0
-  - qt=5.12.5=hd8c4c69_1
-  - qutip=4.4.1=py37h9de70de_0
-  - readline=8.0=hf8c457e_0
-  - requests=2.22.0=py37_1
-  - scipy=1.4.1=py37h921218d_0
-  - setuptools=45.1.0=py37_0
-  - six=1.14.0=py37_0
-  - snowballstemmer=2.0.0=py_0
-  - sparse=0.8.0=py_0
-  - sphinx=2.3.1=py_0
-  - sphinx_rtd_theme=0.4.3=py_0
-  - sphinxcontrib-applehelp=1.0.1=py_0
-  - sphinxcontrib-devhelp=1.0.1=py_0
-  - sphinxcontrib-htmlhelp=1.0.2=py_0
-  - sphinxcontrib-jsmath=1.0.1=py_0
-  - sphinxcontrib-qthelp=1.0.2=py_0
-  - sphinxcontrib-serializinghtml=1.1.3=py_0
-  - sqlite=3.30.1=hcee41ef_0
-  - testpath=0.4.4=py_0
-  - tk=8.6.10=hed695b0_0
-  - tornado=6.0.3=py37h516909a_0
-  - tqdm=4.41.1=py_0
-  - traitlets=4.3.3=py37_0
-  - urllib3=1.25.7=py37_0
-  - wcwidth=0.1.8=py_0
-  - webencodings=0.5.1=py_1
-  - wheel=0.33.6=py37_0
-  - xorg-libxau=1.0.9=h14c3975_0
-  - xorg-libxdmcp=1.1.3=h516909a_0
-  - xz=5.2.4=h14c3975_1001
-  - yaml=0.2.2=h516909a_1
-  - zeromq=4.3.2=he1b5a44_2
-  - zipp=2.0.0=py_0
-  - zlib=1.2.11=h516909a_1006
-  - pip:
-    - pyqt5-sip==4.19.18
-    - pyqtwebengine==5.12.1
+  - qutip
+  - pip
+
+prefix: /home/docs/.conda/envs/filter_functions
 
diff --git a/setup.py b/setup.py
index e0ba6c5..58fa871 100644
--- a/setup.py
+++ b/setup.py
@@ -39,10 +39,10 @@ def extract_version(version_file):
       extras_require={
           'fancy_progressbar': ['tqdm', 'requests'],
           'doc': ['ipython', 'ipykernel', 'nbsphinx', 'numpydoc', 'sphinx',
-                  'jupyter_client', 'sphinx_rtd_theme']
+                  'jupyter_client', 'sphinx_rtd_theme'],
+          'tests': ['pytest', 'coverage', 'coveralls'],
       },
       test_suite='tests',
-      tests_require=['pytest'],
       classifiers=[
           'Programming Language :: Python :: 3',
           'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',