diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..656e169f7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "pypy"
+# command to install dependencies
+install:
+  - "pip install -e ."
+  # - "pip install pep8"
+# command to run tests
+script:
+  # Tests
+  - python setup.py test
+  # pep8 - disabled for now until we can scrub the files to make sure we pass before turning it on
+  # - pep8 .
diff --git a/setup.py b/setup.py
index fe3a993db..77e781f41 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,9 @@
     description='A Python module for working with the Tableau Server REST API.',
     test_suite='test',
     install_requires=[
-        'requests>=2.11,<2.12.0a0',
+        'requests>=2.11,<2.12.0a0'
+    ],
+    tests_require=[
         'requests-mock>=1.0,<1.1a0'
     ]
 )
\ No newline at end of file