diff --git a/.travis.yml b/.travis.yml
index e34deb53..c3d88899 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ python:
   - "2.7"
   - "3.6"
 # command to install dependencies
-install: 
-  - "pip install nose coverage"
-  - "pip install -r requirements.txt"
+install:
+  - "pip install -e '.[test]'"
 # command to run tests
 script: nosetests warrant.tests --nocapture --nologcapture
diff --git a/requirements.txt b/requirements.txt
index 0287bc4e..601bfb0e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 boto3>=1.4.3
 envs>=0.3.0
-mock>=2.0.0
 python-jose>=1.3.2
 requests>=2.13.0
diff --git a/requirements_test.txt b/requirements_test.txt
new file mode 100644
index 00000000..5d611b3c
--- /dev/null
+++ b/requirements_test.txt
@@ -0,0 +1,3 @@
+mock>=2.0.0
+nose
+coverage
diff --git a/setup.py b/setup.py
index ef6f6749..7b728f73 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@
 from pip.req import parse_requirements
 
 install_reqs = parse_requirements('requirements.txt', session=False)
+test_reqs = parse_requirements('requirements_test.txt', session=False)
 
 version = '0.2.0'
 
@@ -26,8 +27,11 @@
     maintainer='Brian Jinwright',
     packages=find_packages(),
     url='https://github.com/capless/warrant',
-    license='GNU GPL V3',
+    license='Apache License 2.0',
     install_requires=[str(ir.req) for ir in install_reqs],
+    extras_require={
+        'test': [str(ir.req) for ir in test_reqs]
+    },
     include_package_data=True,
     zip_safe=True,