diff --git a/suites/debug/fail.py b/suites/debug/fail.py
index fcd56e0..8e30578 100644
--- a/suites/debug/fail.py
+++ b/suites/debug/fail.py
@@ -2,4 +2,4 @@
 from osmo_gsm_tester.test import *
 
 # This can be used to verify that a test failure is reported properly.
-test.set_fail('EpicFail', 'This failure is expected')
+test.set_fail('ExpectedFail', 'This failure is expected')
diff --git a/suites/debug/fail_raise.py b/suites/debug/fail_raise.py
index 22fb940..336029b 100644
--- a/suites/debug/fail_raise.py
+++ b/suites/debug/fail_raise.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.test import *
 
+class ExpectedExn(Exception):
+    pass
+
 # This can be used to verify that a test failure is reported properly.
-raise Failure('EpicFail', 'This failure is expected')
+raise ExpectedExn('This failure is expected')