Index: main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py
===================================================================
--- main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py	(revision 13461)
+++ main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py	(revision 13535)
@@ -547,9 +547,7 @@
         self.browser.open(self.student_path)
         self.browser.getLink("Get Matriculation Number").click()
-        self.assertTrue('Matriculation number ND/15/dep1/FT/010 assigned.'
+        self.assertTrue('Matriculation number ND/15/dep1/FT/001 assigned.'
             in self.browser.contents)
-        self.assertEqual(self.student.matric_number, 'ND/15/dep1/FT/010')
-        self.assertEqual(self.app['faculties']['fac1']['dep1'].next_matric_dict,
-                         {2015: 11})
+        self.assertEqual(self.student.matric_number, 'ND/15/dep1/FT/001')
         self.assertRaises(
             LinkNotFoundError,
@@ -560,5 +558,5 @@
         logcontent = open(logfile).read()
         self.assertTrue('W1000000 - waeup.kwarapoly.students.browser.StudentGetMatricNumberView - '
-                        'W1000000 - ND/15/dep1/FT/010 assigned' in logcontent)
+                        'W1000000 - ND/15/dep1/FT/001 assigned' in logcontent)
         return
 
Index: main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py
===================================================================
--- main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 13461)
+++ main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 13535)
@@ -5,4 +5,5 @@
 from waeup.kofa.university.faculty import Faculty
 from waeup.kofa.university.department import Department
+from waeup.kofa.students.student import Student
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -48,4 +49,14 @@
 
     def test_setMatricNumber(self):
+        # Add second student
+        secondstudent = Student()
+        secondstudent.firstname = u'second'
+        secondstudent.lastname = u'Student'
+        self.app['students'].addStudent(secondstudent)
+        student_id = secondstudent.student_id
+        secondstudent['studycourse'].certificate = self.certificate
+        secondstudent['studycourse'].entry_session = 2015
+        secondstudent['studycourse'].entry_mode = 'nd_ft'
+        IWorkflowState(secondstudent).setState('school fee paid')
         utils = getUtility(IStudentsUtils)
         self.student.matric_number = None
@@ -59,25 +70,15 @@
         IWorkflowState(self.student).setState('school fee paid')
         msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(self.student.matric_number, 'ND/15/dep1/FT/010')
-        self.assertEqual(
-            self.app['faculties']['fac1']['dep1'].next_matric_dict,
-            {2015: 11})
-        # setting a new matric number in 2016, extends next_matric_dict
-        self.student['studycourse'].entry_session = 2016
-        self.student.matric_number = None
-        msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(
-            self.app['faculties']['fac1']['dep1'].next_matric_dict,
-            {2015: 11, 2016: 11})
-        # setting a new matric number in 2014 again, increases the counter
-        self.student.matric_number = None
-        msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(
-            self.app['faculties']['fac1']['dep1'].next_matric_dict,
-            {2015: 11, 2016: 12})
-        # matric number must not exist
+        self.assertEqual(self.student.matric_number, 'ND/15/dep1/FT/001')
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(msg, 'Matriculation number already set.')
-        # certificate must be set.
+        # Second student gets nex matric number
+        msg, mnumber = utils.setMatricNumber(secondstudent)
+        self.assertEqual(secondstudent.matric_number, 'ND/15/dep1/FT/002')
+        self.student.matric_number = u'ND/15/dep1/FT/011'
+        secondstudent.matric_number = None
+        msg, mnumber = utils.setMatricNumber(secondstudent)
+        self.assertEqual(secondstudent.matric_number, 'ND/15/dep1/FT/012')
+        # Certificate must be set.
         self.student.matric_number = None
         self.student['studycourse'].certificate = None
