diff --git a/.gitignore b/.gitignore
index 29fb669d..2a7b1180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+.eggs/
 
 # Installer logs
 pip-log.txt
diff --git a/.travis.yml b/.travis.yml
index 6359c019..ab1007f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,9 @@ env:
 
   - DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
 before_install:
-  # Force an upgrade of py to avoid VersionConflict
+  # Force an upgrade of py & pytest to avoid VersionConflict
   - pip install --upgrade py
+  - pip install "pytest>=2.8,<3"
   - pip install codecov
 install:
   - pip install Django${DJANGO} djangorestframework${DRF}
diff --git a/setup.cfg b/setup.cfg
index 0cd8d9d9..0d607daa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,3 +3,17 @@ test = pytest
 
 [wheel]
 universal = 1
+
+[flake8]
+ignore = E501
+max-line-length = 100
+
+[isort]
+known_django = django
+sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER
+default_section = THIRDPARTY
+known_standard_library = factory,mock,requests
+known_first_party = rest_framework_json_api
+multi_line_output = 3
+line_length = 100
+indent = 4
diff --git a/setup.py b/setup.py
index ad4805a0..ca3a8753 100755
--- a/setup.py
+++ b/setup.py
@@ -105,7 +105,7 @@ def get_package_data(package):
     tests_require=[
         'pytest-factoryboy',
         'pytest-django',
-        'pytest>=2.8',
+        'pytest>=2.8,<3',
     ] + mock,
     zip_safe=False,
 )