diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
index 378b61d2d2..e52e17b8dc 100644
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -5,7 +5,7 @@
 
 
 grp = import_helper.import_module('grp')
-@unittest.skipUnless(hasattr(grp, 'getgrall'), 'Does not have getgrall()')
+
 class GroupDatabaseTestCase(unittest.TestCase):
 
     def check_value(self, value):
@@ -49,10 +49,12 @@ def test_values_extended(self):
 
     def test_errors(self):
         self.assertRaises(TypeError, grp.getgrgid)
+        self.assertRaises(TypeError, grp.getgrgid, 3.14)
         self.assertRaises(TypeError, grp.getgrnam)
+        self.assertRaises(TypeError, grp.getgrnam, 42)
         self.assertRaises(TypeError, grp.getgrall, 42)
         # embedded null character
-        self.assertRaises(ValueError, grp.getgrnam, 'a\x00b')
+        self.assertRaisesRegex(ValueError, 'null', grp.getgrnam, 'a\x00b')
 
         # try to get some errors
         bynames = {}