diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py
new file mode 100644
index 0000000..bf4f150
--- /dev/null
+++ b/tests/test_progit_flask_ui_repo.py
@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+
+"""
+ (c) 2015 - Copyright Red Hat Inc
+
+ Authors:
+   Pierre-Yves Chibon <pingou@pingoured.fr>
+
+"""
+
+__requires__ = ['SQLAlchemy >= 0.8']
+import pkg_resources
+
+import unittest
+import shutil
+import sys
+import os
+
+import json
+from mock import patch
+
+sys.path.insert(0, os.path.join(os.path.dirname(
+    os.path.abspath(__file__)), '..'))
+
+import progit.lib
+import tests
+
+
+class ProgitFlaskRepotests(tests.Modeltests):
+    """ Tests for flask app controller of progit """
+
+    def setUp(self):
+        """ Set up the environnment, ran before every tests. """
+        super(ProgitFlaskRepotests, self).setUp()
+
+        progit.APP.config['TESTING'] = True
+        progit.SESSION = self.session
+        progit.ui.SESSION = self.session
+        progit.ui.app.SESSION = self.session
+        progit.ui.repo.SESSION = self.session
+
+        progit.APP.config['GIT_FOLDER'] = tests.HERE
+        progit.APP.config['FORK_FOLDER'] = os.path.join(
+            tests.HERE, 'forks')
+        progit.APP.config['TICKETS_FOLDER'] = os.path.join(
+            tests.HERE, 'tickets')
+        progit.APP.config['DOCS_FOLDER'] = os.path.join(
+            tests.HERE, 'docs')
+        self.app = progit.APP.test_client()
+
+    def test_add_user(self):
+        """ Test the add_user endpoint. """
+
+        output = self.app.get('/foo/adduser')
+        self.assertEqual(output.status_code, 302)
+
+        user = tests.FakeUser()
+        with tests.user_set(progit.APP, user):
+            output = self.app.get('/foo/adduser')
+            self.assertEqual(output.status_code, 404)
+
+            tests.create_projects(self.session)
+
+            output = self.app.get('/test/adduser')
+            self.assertEqual(output.status_code, 403)
+
+        user.username = 'pingou'
+        with tests.user_set(progit.APP, user):
+            output = self.app.get('/test/adduser')
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Add user</h2>' in output.data)
+            self.assertTrue(
+                '<ul id="flashes">\n                </ul>' in output.data)
+
+            csrf_token = output.data.split(
+                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+
+            data = {
+                'user': 'ralph',
+            }
+
+            output = self.app.post('/test/adduser', data=data)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Add user</h2>' in output.data)
+            self.assertTrue(
+                '<ul id="flashes">\n                </ul>' in output.data)
+
+            data['csrf_token'] = csrf_token
+            output = self.app.post('/test/adduser', data=data)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<h2>Add user</h2>' in output.data)
+            self.assertTrue(
+                '<li class="error">No user &#34;ralph&#34; found</li>'
+                in output.data)
+
+            data['user'] = 'foo'
+            output = self.app.post(
+                '/test/adduser', data=data, follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+            self.assertTrue('<header class="repo">' in output.data)
+            self.assertTrue('<h2>Settings</h2>' in output.data)
+            self.assertTrue(
+                '<li class="message">User added</li>' in output.data)
+
+
+if __name__ == '__main__':
+    SUITE = unittest.TestLoader().loadTestsFromTestCase(ProgitFlaskRepotests)
+    unittest.TextTestRunner(verbosity=2).run(SUITE)