diff --git a/.travis.yml b/.travis.yml
index 37a114212..1bb6cdaff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,9 @@ python:
 - 3.5.3
 - 3.6.1
 install:
-- echo "pytest>3" >> requirements.txt
-- echo "pytest-asyncio" >> requirements.txt
 - echo "git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]" >> requirements.txt
 - pip install -r requirements.txt
-- pip install .
+- pip install .[test]
 script:
 - python -m compileall ./redbot/cogs
 - python -m pytest
diff --git a/setup.py b/setup.py
index 1fd4a50e8..f1e5b2068 100644
--- a/setup.py
+++ b/setup.py
@@ -23,9 +23,12 @@ def get_package_list():
 def get_requirements():
     with open('requirements.txt') as f:
         requirements = f.read().splitlines()
-    if IS_TRAVIS and not IS_DEPLOYING:
+    try:
         requirements.remove('git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]')
-    else:
+    except IndexError:
+        pass
+
+    if IS_DEPLOYING or not IS_TRAVIS:
         requirements.append('discord.py>=1.0.0a0')  # Because RTD
     if sys.platform.startswith("linux"):
         requirements.append("distro")
@@ -122,7 +125,7 @@ setup(
     dependency_links=dep_links,
     extras_require={
         'test': [
-            'pytest>=3', 'pytest-asyncio'
+            'pytest>3', 'pytest-asyncio'
         ],
         'mongo': ['motor'],
         'docs': ['sphinx', 'sphinxcontrib-asyncio', 'sphinx_rtd_theme'],