diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py
index 95cbacbf0c..bfe0fe4ef0 100644
--- a/wagtail/wagtailusers/tests.py
+++ b/wagtail/wagtailusers/tests.py
@@ -1,19 +1,110 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-import unittest
-
 from django.test import TestCase
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from wagtail.tests.utils import login
 
 
-@unittest.skip("Need real tests")
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)
+class TestUserIndexView(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailusers_index'), params)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    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 TestUserCreateView(TestCase):
+    def setUp(self):
+        login(self.client)
+
+    def get(self, params={}):
+        return self.client.get(reverse('wagtailusers_create'), params)
+
+    def post(self, post_data={}):
+        return self.client.post(reverse('wagtailusers_create'), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_create(self):
+        response = self.post({
+            'username': "testuser",
+            'email': "test@user.com",
+            'first_name': "Test",
+            'last_name': "User",
+            'password1': "password",
+            'password2': "password",
+        })
+
+        # Should redirect back to index
+        self.assertEqual(response.status_code, 302)
+
+        # Check that the user was created
+        users = User.objects.filter(username='testuser')
+        self.assertEqual(users.count(), 1)
+        self.assertEqual(users.first().email, 'test@user.com')
+
+
+class TestUserEditView(TestCase):
+    def setUp(self):
+        # Create a user to edit
+        self.test_user = User.objects.create_user(username='testuser', email='testuser@email.com', password='password')
+
+        # Login
+        login(self.client)
+
+    def get(self, params={}, user_id=None):
+        return self.client.get(reverse('wagtailusers_edit', args=(user_id or self.test_user.id, )), params)
+ 
+    def post(self, post_data={}, user_id=None):
+        return self.client.post(reverse('wagtailusers_edit', args=(user_id or self.test_user.id, )), post_data)
+
+    def test_status_code(self):
+        self.assertEqual(self.get().status_code, 200)
+
+    def test_nonexistant_redirect(self):
+        self.assertEqual(self.get(user_id=100000).status_code, 404)
+
+    def test_edit(self):
+        response = self.post({
+            'username': "testuser",
+            'email': "test@user.com",
+            'first_name': "Edited",
+            'last_name': "User",
+            'password1': "password",
+            'password2': "password",
+        })
+
+        # Should redirect back to index
+        self.assertEqual(response.status_code, 302)
+
+        # Check that the user was edited
+        user = User.objects.get(id=self.test_user.id)
+        self.assertEqual(user.first_name, 'Edited')
+
+    def test_edit_validation_error(self):
+        # Leave "username" field blank. This should give a validation error
+        response = self.post({
+            'username': "",
+            'email': "test@user.com",
+            'first_name': "Teset",
+            'last_name': "User",
+            'password1': "password",
+            'password2': "password",
+        })
+
+        # Should not redirect to index
+        self.assertEqual(response.status_code, 200)