diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index 41a5ec97573..5dbcf9862bc 100644
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -87,6 +87,7 @@ grp_getgrall(PyObject *self, PyObject *args)
         }
         Py_DECREF(v);
     }
+    endgrent();
     return d;
 }
 
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 290dc451455..4c1b7db8789 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -102,6 +102,7 @@ pwd_getpwall(PyObject *self, PyObject *args)
 		}
 		Py_DECREF(v);
 	}
+	endpwent();
 	return d;
 }
 #endif