diff --git a/disco/util/hashmap.py b/disco/util/hashmap.py
index 19a6b2d..74541b6 100644
--- a/disco/util/hashmap.py
+++ b/disco/util/hashmap.py
@@ -11,7 +11,10 @@ class HashMap(dict):
         return iter(self)
 
     def items(self):
-        return six.iteritems(self)
+        if six.PY3:
+            return super(HashMap, self).items()
+        else:
+            return super(HashMap, self).iteritems()
 
     def find(self, predicate):
         if not callable(predicate):
diff --git a/tests/util/hashmap.py b/tests/util/hashmap.py
index b57da6a..3ffa931 100644
--- a/tests/util/hashmap.py
+++ b/tests/util/hashmap.py
@@ -38,3 +38,9 @@ def test_hashmap_builtins(hashmap):
         assert item in hashmap
 
     assert hashmap.popitem()[1] > 1
+
+
+def test_hashmap_items(hashmap):
+    assert len(list(hashmap.items())) == 100000
+    assert list(hashmap.items())[0][0] == 0
+    assert list(hashmap.items())[0][1] == hashmap[0]