diff --git a/lostplaces/lostplaces_app/tests/views/test_place_views.py b/lostplaces/lostplaces_app/tests/views/test_place_views.py
index 813b3b0..d15354e 100644
--- a/lostplaces/lostplaces_app/tests/views/test_place_views.py
+++ b/lostplaces/lostplaces_app/tests/views/test_place_views.py
@@ -1,12 +1,20 @@
 import datetime
 
-from django.test import TestCase, Client
+from django.test import TestCase
 from django.urls import reverse_lazy
 from django.contrib.auth.models import User
 
 from lostplaces_app.models import Place
+from lostplaces_app.views import (
+    PlaceCreateView,
+    PlaceListView
+)
+from lostplaces_app.forms import PlaceImageCreateForm, PlaceForm
+from lostplaces_app.tests.views import ViewTestCase
 
-class TestPlaceCreateView(TestCase):
+class TestPlaceCreateView(ViewTestCase, TestCase):
+    
+    view = PlaceCreateView
     
     @classmethod
     def setUpTestData(cls):
@@ -27,26 +35,39 @@ class TestPlaceCreateView(TestCase):
         place.tags.add('I a tag', 'testlocation')
         place.save()
         
-    def setUp(self):
-        self. client = Client()
-
-    def test_url_logged_in(self):
+    def test_has_forms(self):
         self.client.login(username='testpeter', password='Develop123')
-        response = self.client.get(reverse_lazy('place_detail', kwargs={'pk': 1}))
-        self.assertEqual(response.status_code, 200)
-
-    def test_url_not_logged_in(self):
-        url = reverse_lazy('place_detail', kwargs={'pk': 1})
-        response = self.client.get(url)
-        self.assertRedirects(
-            response=response,
-            expected_url='?'.join([str(reverse_lazy('login')), 'next=/place/1/']),
-            status_code=302, 
-            target_status_code=200, 
-            msg_prefix='''Accesing PlaceDetailView while not logged should
-            redirect to login page with redirect params
-            ''', 
-            fetch_redirect_response=True
+        response = self.client.get(reverse_lazy('place_create'))
+        
+        self._test_form(response, 'place_image_form', PlaceImageCreateForm)
+        self._test_form(response, 'place_form', PlaceForm)
+        
+class TestPlaceListView(ViewTestCase, TestCase):
+    view = PlaceListView
+    
+    @classmethod
+    def setUpTestData(cls):
+        user = User.objects.create_user(
+            username='testpeter',
+            password='Develop123'
         )
-
+        
+        place = Place.objects.create(
+            name='Im a place',
+            submitted_when=datetime.datetime.now(),
+            submitted_by=user.explorer,
+            location='Testtown',
+            latitude=50.5,
+            longitude=7.0,
+            description='This is just a test, do not worry'
+        )
+        place.tags.add('I a tag', 'testlocation')
+        place.save()
+        
+    def test_list_view(self):
+        self.client.login(username='testpeter', password='Develop123')
+        response = self.client.get(reverse_lazy('place_list'))
+        
+        self._test_has_context_key(response, 'place_map_center')
+    
     
\ No newline at end of file