diff --git a/generic/error_cleanup.py b/generic/error_cleanup.py
new file mode 100644
index 00000000..3f6b84d8
--- /dev/null
+++ b/generic/error_cleanup.py
@@ -0,0 +1,20 @@
+#! /usr/bin/env python
+
+from avocado import Test
+from avocado import main
+
+
+class error_cleanup(Test):
+    """
+    Raise an exception during tearDown()
+    """
+
+    def test(self):
+        pass
+
+    def tearDown(self):
+        self.error("Test a bug in tearDown()")
+
+
+if __name__ == "__main__":
+    main()