diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index 6bb364ba4..ef52af3ff 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailusers.models import UserProfile
@@ -74,7 +74,7 @@ class TestUserEditView(TestCase, WagtailTestUtils):
 
     def get(self, params={}, user_id=None):
         return self.client.get(reverse('wagtailusers_users_edit', args=(user_id or self.test_user.id, )), params)
- 
+
     def post(self, post_data={}, user_id=None):
         return self.client.post(reverse('wagtailusers_users_edit', args=(user_id or self.test_user.id, )), post_data)
 
@@ -132,3 +132,99 @@ class TestUserProfileCreation(TestCase, WagtailTestUtils):
         self.assertIsInstance(UserProfile.get_for_user(self.test_user), UserProfile)
         # and get it from the db too
         self.assertEqual(UserProfile.objects.filter(user=self.test_user).count(), 1)
+
+
+class TestGroupIndexView(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailusers_groups_index'), params)
+
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/groups/index.html')
+
+    def test_search(self):
+        response = self.get({'q': "Hello"})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['query_string'], "Hello")
+
+    def test_pagination(self):
+        pages = ['0', '1', '-1', '9999', 'Not a page']
+        for page in pages:
+            response = self.get({'p': page})
+            self.assertEqual(response.status_code, 200)
+
+
+class TestGroupCreateView(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailusers_groups_create'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailusers_groups_create'), post_data)
+
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/groups/create.html')
+
+    def test_create(self):
+        response = self.post({
+            'name': "test group",
+        })
+
+        # Should redirect back to index
+        self.assertRedirects(response, reverse('wagtailusers_groups_index'))
+
+        # Check that the user was created
+        groups = Group.objects.filter(name='test group')
+        self.assertEqual(groups.count(), 1)
+
+
+class TestGroupEditView(TestCase, WagtailTestUtils):
+    def setUp(self):
+        # Create a group to edit
+        self.test_group = Group.objects.create(name='test group')
+
+        # Login
+        self.login()
+
+    def get(self, params={}, group_id=None):
+        return self.client.get(reverse('wagtailusers_groups_edit', args=(group_id or self.test_group.id, )), params)
+
+    def post(self, post_data={}, group_id=None):
+        return self.client.post(reverse('wagtailusers_groups_edit', args=(group_id or self.test_group.id, )), post_data)
+
+    def test_simple(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailusers/groups/edit.html')
+
+    def test_nonexistant_redirect(self):
+        self.assertEqual(self.get(group_id=100000).status_code, 404)
+
+    def test_edit(self):
+        response = self.post({
+            'name': "test group edited",
+        })
+
+        # Should redirect back to index
+        self.assertRedirects(response, reverse('wagtailusers_groups_index'))
+
+        # Check that the group was edited
+        group = Group.objects.get(id=self.test_group.id)
+        self.assertEqual(group.name, 'test group edited')
+
+    def test_edit_validation_error(self):
+        # Leave "name" field blank. This should give a validation error
+        response = self.post({
+            'name': "",
+        })
+
+        # Should not redirect to index
+        self.assertEqual(response.status_code, 200)