diff --git a/glance/tests/unit/api/test_common.py b/glance/tests/unit/api/test_common.py
index ab1ccb995a..cf3c9f93fb 100644
--- a/glance/tests/unit/api/test_common.py
+++ b/glance/tests/unit/api/test_common.py
@@ -34,7 +34,7 @@ class SimpleIterator(object):
             yield chunk
             chunk = read_chunk()
         else:
-            raise StopIteration()
+            return
 
 
 class TestSizeCheckedIter(testtools.TestCase):
diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py
index 48911c6730..98ff61c217 100644
--- a/glance/tests/unit/common/test_utils.py
+++ b/glance/tests/unit/common/test_utils.py
@@ -87,7 +87,7 @@ class TestUtils(test_utils.BaseTestCase):
             yield chunk
             iteration += 1
             if iteration >= max_iterations:
-                raise StopIteration()
+                return
 
     def _test_reader_chunked(self, chunk_size, read_size, max_iterations=5):
         generator = self._create_generator(chunk_size, max_iterations)