diff --git a/lists/tests/test_models.py b/lists/tests/test_models.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e680831f23c51f053c348f03c457477e27db41a
--- /dev/null
+++ b/lists/tests/test_models.py
@@ -0,0 +1,34 @@
+from django.test import TestCase
+from lists.models import Item, List
+
+
+
+class ListAndItemModelTest(TestCase):
+    def test_saving_and_retrieving_items(self):
+        list_ = List()
+        list_.save()
+
+        first_item = Item()
+        first_item.text = "The first (ever) list item"
+        first_item.list = list_
+        first_item.save()
+
+        second_item = Item()
+        second_item.text = "Item the second"
+        second_item.list = list_
+        second_item.save()
+
+        saved_list = List.objects.first()
+        self.assertEqual(saved_list, list_)
+
+        saved_items = Item.objects.all()
+        self.assertEqual(saved_items.count(), 2)
+
+        first_saved_item = saved_items[0]
+        second_saved_item = saved_items[1]
+        self.assertEqual(first_saved_item.text, "The first (ever) list item")
+        self.assertEqual(first_saved_item.list, list_)
+        self.assertEqual(second_saved_item.text, "Item the second")
+        self.assertEqual(second_saved_item.list, list_)
+
+
diff --git a/lists/tests/test_all.py b/lists/tests/test_views.py
similarity index 83%
rename from lists/tests/test_all.py
rename to lists/tests/test_views.py
index 4995c20d500df483ac34b73519a287f379125e79..09512c633fcb7d549947a2e86b00293db9cf74c5 100644
--- a/lists/tests/test_all.py
+++ b/lists/tests/test_views.py
@@ -53,35 +53,6 @@ class HomePageTest(TestCase):
     #                   response.content)
 
 
-class ListAndItemModelTest(TestCase):
-    def test_saving_and_retrieving_items(self):
-        list_ = List()
-        list_.save()
-
-        first_item = Item()
-        first_item.text = "The first (ever) list item"
-        first_item.list = list_
-        first_item.save()
-
-        second_item = Item()
-        second_item.text = "Item the second"
-        second_item.list = list_
-        second_item.save()
-
-        saved_list = List.objects.first()
-        self.assertEqual(saved_list, list_)
-
-        saved_items = Item.objects.all()
-        self.assertEqual(saved_items.count(), 2)
-
-        first_saved_item = saved_items[0]
-        second_saved_item = saved_items[1]
-        self.assertEqual(first_saved_item.text, "The first (ever) list item")
-        self.assertEqual(first_saved_item.list, list_)
-        self.assertEqual(second_saved_item.text, "Item the second")
-        self.assertEqual(second_saved_item.list, list_)
-
-
 class NewListTest(TestCase):
     def test_saving_a_POST_request(self):
         self.client.post("/lists/new", data={"item_text": "A new list item"})