diff --git a/pygit2/config.py b/pygit2/config.py
index ce8cdb97d..fd9ab4967 100644
--- a/pygit2/config.py
+++ b/pygit2/config.py
@@ -63,7 +63,7 @@ def next(self):
 
     def __next__(self):
         entry = self._next_entry()
-        return entry.name
+        return entry
 
 
 class ConfigMultivarIterator(ConfigIterator):
diff --git a/test/test_config.py b/test/test_config.py
index 03be486e6..5678c6994 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -173,8 +173,9 @@ def test_iterator(self):
         config = self.repo.config
         lst = {}
 
-        for name in config:
-            lst[name] = config[name]
+        for entry in config:
+            self.assertGreater(entry.level, -1)
+            lst[entry.name] = entry.value_string
 
         self.assertTrue('core.bare' in lst)
         self.assertTrue(lst['core.bare'])