diff --git a/stages/models.py b/stages/models.py
index cd80879..78028fb 100644
--- a/stages/models.py
+++ b/stages/models.py
@@ -81,10 +81,10 @@ class Klass(models.Model):
         return self.name
 
     def is_Ede_pe(self):
-        return 'EDEpe' in self.name
+        return 'EDE' in self.name and 'pe' in self.name
 
     def is_Ede_ps(self):
-        return 'EDEps' in self.name
+        return 'EDE' in self.name and 'ps' in self.name
 
 
 class Teacher(models.Model):
diff --git a/stages/tests.py b/stages/tests.py
index 65d190f..518a90a 100644
--- a/stages/tests.py
+++ b/stages/tests.py
@@ -274,6 +274,20 @@ tél. 032 886 33 00
         self.assertEqual(response['Content-Type'], 'application/pdf')
         self.assertGreater(len(response.content), 200)
 
+    def test_EDEpe_klass(self):
+        lev3 = Level.objects.create(name='3')
+        klass4 = Klass.objects.create(name="3EDEp_pe", section=Section.objects.get(name='EDE'), level=lev3)
+        self.assertTrue(klass4.is_Ede_pe())
+        klass5 = Klass.objects.create(name="3EDEpe", section=Section.objects.get(name='EDE'), level=lev3)
+        self.assertTrue(klass5.is_Ede_pe())
+
+    def test_EDEps_klass(self):
+        lev3 = Level.objects.create(name='3')
+        klass4 = Klass.objects.create(name="3EDEp_ps", section=Section.objects.get(name='EDE'), level=lev3)
+        self.assertTrue(klass4.is_Ede_ps())
+        klass5 = Klass.objects.create(name="3EDEps", section=Section.objects.get(name='EDE'), level=lev3)
+        self.assertTrue(klass5.is_Ede_ps())
+
 
 class PeriodTest(TestCase):
     def setUp(self):