diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
index f5aeb78..a7ebb18 100644
--- a/quantities/tests/test_umath.py
+++ b/quantities/tests/test_umath.py
@@ -226,7 +226,7 @@ def test_arctan2(self):
             np.arctan2(3*pq.V, 3*pq.V),
             np.radians(45)*pq.dimensionless
             )
-        self.assertRaises(ValueError, np.arctan2, (1*pq.m, 1*pq.m))
+        self.assertRaises((TypeError, ValueError), np.arctan2, (1*pq.m, 1*pq.m))
 
     def test_hypot(self):
         self.assertQuantityEqual(np.hypot(3 * pq.m, 4 * pq.m),  5 * pq.m)