diff --git a/.travis.yml b/.travis.yml
index 07289baf..d04a3992 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,10 @@ env:
 install:
     # Dependencies
     - sudo apt-get -qq update
-    - pip install --upgrade -qq pip
+    - pip install --upgrade -qq pip setuptools
     - sudo apt-get -qq install cdparanoia cdrdao flac gir1.2-glib-2.0 libcdio-dev libgirepository1.0-dev libiso9660-dev libsndfile1-dev sox swig libcdio-utils
-    - pip install musicbrainzngs mutagen pycdio==0.21 PyGObject requests setuptools setuptools_scm
-
-    # Testing dependencies
-    - pip install twisted flake8
+    # Additional dependencies for PyGObject
+    - sudo apt-get -qq install libglib2.0-dev libcairo2-dev libcairo2-dev libffi-dev
 
     # Build bundled C utils
     - cd src
@@ -29,8 +27,8 @@ install:
     - cd ..
 
     # Installing
-    - python setup.py install
+    - pip install .
 
 script:
-    - if [ ! "$FLAKE8" = true ]; then python -m unittest discover; fi
-    - if [ "$FLAKE8" = true ]; then flake8 --benchmark --statistics; fi
+    - if [ ! "$FLAKE8" = true ]; then pip install .[test] && python -m unittest discover; fi
+    - if [ "$FLAKE8" = true ]; then pip install .[lint] && flake8 --benchmark --statistics; fi
diff --git a/requirements.txt b/requirements.txt
index c62bb6df..d6e1198b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1 @@
-musicbrainzngs
-mutagen
-pycdio>0.20
-PyGObject
-requests
-setuptools_scm
+-e .
diff --git a/setup.py b/setup.py
index bbcfa0b4..6c273aaf 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,17 @@
     python_requires='>=2.7,<3',
     packages=find_packages(),
     setup_requires=['setuptools_scm'],
+    install_requires=[
+        'musicbrainzngs',
+        'mutagen',
+        'pycdio>0.20',
+        'PyGObject',
+        'requests',
+    ],
+    extras_require={
+        'test': ['twisted'],
+        'lint': ['flake8'],
+    },
     entry_points={
         'console_scripts': [
             'whipper = whipper.command.main:main'
@@ -19,4 +30,16 @@
     data_files=[
         ('share/metainfo', ['com.github.whipper_team.Whipper.metainfo.xml']),
     ],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: End Users/Desktop',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',  # noqa: E501
+        'Natural Language :: English',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 2 :: Only',
+        'Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping',
+    ],
 )