diff --git a/tests/queries.py b/tests/queries.py
index d811db3..7af10cf 100644
--- a/tests/queries.py
+++ b/tests/queries.py
@@ -35,7 +35,7 @@ class Queries(TestCase):
         eav.unregister(Patient)
 
     def test_get_or_create_with_eav(self):
-        p = Patient.objects.get_or_create(name='Bob', eav__age=5)
+        Patient.objects.get_or_create(name='Bob', eav__age=5)
         self.assertEqual(Patient.objects.count(), 1)
         self.assertEqual(Value.objects.count(), 1)
         p = Patient.objects.get_or_create(name='Bob', eav__age=5)
@@ -49,7 +49,7 @@ class Queries(TestCase):
         p1, _ = Patient.objects.get_or_create(name='Bob', eav__age=6)
         self.assertEqual(Patient.objects.get(eav__age=6), p1)
 
-        p2, _ = Patient.objects.get_or_create(name='Fred', eav__age=6)
+        Patient.objects.create(name='Fred', eav__age=6)
         self.assertRaises(MultipleObjectsReturned, lambda: Patient.objects.get(eav__age=6))
 
     def test_filtering_on_normal_and_eav_fields(self):
diff --git a/tests/registry.py b/tests/registry.py
index 21113f1..1700b19 100644
--- a/tests/registry.py
+++ b/tests/registry.py
@@ -3,11 +3,10 @@ from django.test import TestCase
 import eav
 from eav.registry import EavConfig
 
-from .models import Patient, Encounter, ExampleModel
+from .models import Encounter, ExampleModel, Patient
 
 
 class RegistryTests(TestCase):
-
     def setUp(self):
         pass
 
@@ -33,10 +32,8 @@ class RegistryTests(TestCase):
         self.assertEqual(Patient._eav_config_cls.manager_attr, 'objects')
         self.assertFalse(Patient._eav_config_cls.manager_only)
         self.assertEqual(Patient._eav_config_cls.eav_attr, 'eav')
-        self.assertEqual(Patient._eav_config_cls.generic_relation_attr,
-                         'eav_values')
-        self.assertEqual(Patient._eav_config_cls.generic_relation_related_name,
-                         None)
+        self.assertEqual(Patient._eav_config_cls.generic_relation_attr, 'eav_values')
+        self.assertEqual(Patient._eav_config_cls.generic_relation_related_name, None)
         eav.unregister(Patient)
 
     def test_registering_overriding_defaults(self):
@@ -70,7 +67,6 @@ class RegistryTests(TestCase):
     def test_unregistering_via_decorator(self):
         self.assertTrue(ExampleModel.objects.__class__.__name__ == 'EntityManager')
         eav.unregister(ExampleModel)
-        e = ExampleModel()
         self.assertFalse(ExampleModel.objects.__class__.__name__ == 'EntityManager')
 
     def test_unregistering_unregistered_model_proceeds_silently(self):