diff --git a/.gitignore b/.gitignore
index 3b7a9ab5a..8b9cc54a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 __pycache__/
 *.py[cod]
 *$py.class
+test.junit.xml
 
 # C extensions
 *.so
@@ -145,4 +146,4 @@ $RECYCLE.BIN/
 
 # Documentation
 docs/_site/
-docs/.jekyll-metadata
\ No newline at end of file
+docs/.jekyll-metadata
diff --git a/setup.cfg b/setup.cfg
index c3c4b578b..6136b814a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,3 +20,9 @@ versionfile_build = tableauserverclient/_version.py
 tag_prefix = v
 #parentdir_prefix =
 
+[aliases]
+smoke=pytest
+
+[tool:pytest]
+testpaths = test smoke
+addopts = --junitxml=./test.junit.xml
diff --git a/setup.py b/setup.py
index fc9933d3a..2c8718d5d 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,14 @@
     license='MIT',
     description='A Python module for working with the Tableau Server REST API.',
     test_suite='test',
+    setup_requires=[
+        'pytest-runner'
+    ],
     install_requires=[
-        'requests>=2.11,<2.12.0a0'
+        'requests>=2.11,<3.0'
     ],
     tests_require=[
-        'requests-mock>=1.0,<1.1a0'
+        'requests-mock>=1.0,<2.0',
+        'pytest'
     ]
 )
diff --git a/smoke/__init__.py b/smoke/__init__.py
new file mode 100644
index 000000000..e69de29bb