Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7142)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7143)
@@ -639,5 +639,6 @@
         self.browser.getControl('Perform import...').click()
         self.assertTrue('Processing of 1 rows failed' in self.browser.contents)
-        self.assertTrue('Successfully processed 2 rows' in self.browser.contents)
+        self.assertTrue('Successfully processed 2 rows'
+                        in self.browser.contents)
         return
 
@@ -656,5 +657,5 @@
             name="form.password_repeat").value = 'pw'
         self.browser.getControl("Save").click()
-        self.assertTrue('Constraint not satisfied' in self.browser.contents)
+        self.assertTrue('Value is too short' in self.browser.contents)
         self.browser.getControl(name="form.password").value = 'new_password'
         self.browser.getControl(
@@ -666,5 +667,5 @@
             name="form.password_repeat").value = 'new_password'
         self.browser.getControl("Save").click()
-        self.assertTrue('Form has been saved' in self.browser.contents)
+        self.assertTrue('Password has been set' in self.browser.contents)
         # We are still logged in. Changing the password hasn't thrown us out.
         self.browser.getLink("My Data").click()
