diff --git a/example/tests/test_generic_viewset.py b/example/tests/test_generic_viewset.py
index 15d9bd1e..01e78053 100644
--- a/example/tests/test_generic_viewset.py
+++ b/example/tests/test_generic_viewset.py
@@ -4,7 +4,6 @@
 from example.tests import TestBase
 
 
-@override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize')
 class GenericViewSet(TestBase):
     """
     Test expected responses coming from a Generic ViewSet
@@ -36,7 +35,8 @@ def test_ember_expected_renderer(self):
         """
         url = reverse('user-manual-resource-name', kwargs={'pk': self.miles.pk})
 
-        response = self.client.get(url)
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.get(url)
         self.assertEqual(200, response.status_code)
 
         expected = {
@@ -75,14 +75,15 @@ def test_default_validation_exceptions(self):
                 }
             ]
         }
-        response = self.client.post('/identities', {
-            'data': {
-                'type': 'users',
-                'attributes': {
-                    'email': 'bar', 'first_name': 'alajflajaljalajlfjafljalj'
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.post('/identities', {
+                'data': {
+                    'type': 'users',
+                    'attributes': {
+                        'email': 'bar', 'first_name': 'alajflajaljalajlfjafljalj'
+                    }
                 }
-            }
-        })
+            })
 
         assert expected == response.json()
 
diff --git a/example/tests/test_model_viewsets.py b/example/tests/test_model_viewsets.py
index df95bf42..185ebcdc 100644
--- a/example/tests/test_model_viewsets.py
+++ b/example/tests/test_model_viewsets.py
@@ -7,7 +7,6 @@
 from example.tests import TestBase
 
 
-@override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize')
 class ModelViewSetTests(TestBase):
     """
     Test usage with ModelViewSets, also tests pluralization, camelization,
@@ -26,7 +25,8 @@ def test_key_in_list_result(self):
         """
         Ensure the result has a 'user' key since that is the name of the model
         """
-        response = self.client.get(self.list_url)
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.get(self.list_url)
         self.assertEqual(response.status_code, 200)
 
         user = get_user_model().objects.all()[0]
@@ -63,7 +63,8 @@ def test_page_two_in_list_result(self):
         """
         Ensure that the second page is reachable and is the correct data.
         """
-        response = self.client.get(self.list_url, {'page[number]': 2})
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.get(self.list_url, {'page[number]': 2})
         self.assertEqual(response.status_code, 200)
 
         user = get_user_model().objects.all()[1]
@@ -102,7 +103,8 @@ def test_page_range_in_list_result(self):
         tests pluralization as two objects means it converts ``user`` to
         ``users``.
         """
-        response = self.client.get(self.list_url, {'page[size]': 2})
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.get(self.list_url, {'page[size]': 2})
         self.assertEqual(response.status_code, 200)
 
         users = get_user_model().objects.all()
@@ -148,7 +150,8 @@ def test_key_in_detail_result(self):
         """
         Ensure the result has a 'user' key.
         """
-        response = self.client.get(self.detail_url)
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.get(self.detail_url)
         self.assertEqual(response.status_code, 200)
 
         expected = {
@@ -199,7 +202,8 @@ def test_key_in_post(self):
             }
         }
 
-        response = self.client.put(self.detail_url, data=data)
+        with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
+            response = self.client.put(self.detail_url, data=data)
 
         assert data == response.json()
 
diff --git a/requirements-development.txt b/requirements-development.txt
index cf8ecb3b..614b6503 100644
--- a/requirements-development.txt
+++ b/requirements-development.txt
@@ -8,7 +8,7 @@ flake8==3.7.5
 flake8-isort==2.6.0
 isort==4.3.4
 mock==2.0.0
-pytest==4.1.1
+pytest==4.2.0
 pytest-cov==2.6.1
 pytest-django==3.4.7
 pytest-factoryboy==2.0.2