diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py
index 626b937..b7b3c07 100644
--- a/Lib/test/test_hmac.py
+++ b/Lib/test/test_hmac.py
@@ -63,7 +63,7 @@
             dig = h.hexdigest()
             h2 = h.copy()
         except:
-            fail("Exception raised during normal usage of HMAC class.")
+            self.fail("Exception raised during normal usage of HMAC class.")
 
 class CopyTestCase(unittest.TestCase):
     def test_attributes(self):
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 7860dd3..218ae9c 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -8,7 +8,7 @@
 
     def makefile(self, mode, bufsize=None):
         if mode != 'r' and mode != 'rb':
-            raise UnimplementedFileMode()
+            raise httplib.UnimplementedFileMode()
         return StringIO.StringIO(self.text)
 
 # Test HTTP status lines