diff --git a/moto/kinesis/models.py b/moto/kinesis/models.py
index 886a3a61f..e7a389981 100644
--- a/moto/kinesis/models.py
+++ b/moto/kinesis/models.py
@@ -123,17 +123,12 @@ class Stream(BaseModel):
         self.tags = {}
         self.status = "ACTIVE"
 
-        if six.PY3:
-            izip_longest = itertools.zip_longest
-        else:
-            izip_longest = itertools.izip_longest
+        step = 2**128 // shard_count
+        hash_ranges = itertools.chain(map(lambda i: (i, i * step, (i + 1) * step),
+                                          range(shard_count - 1)),
+                                [(shard_count - 1, (shard_count - 1) * step, 2**128)])
+        for index, start, end in hash_ranges:
 
-        for index, start, end in izip_longest(range(shard_count),
-                                              range(0, 2**128, 2 **
-                                                    128 // shard_count),
-                                              range(2**128 // shard_count, 2 **
-                                                    128, 2**128 // shard_count),
-                                              fillvalue=2**128):
             shard = Shard(index, start, end)
             self.shards[shard.shard_id] = shard
 
diff --git a/tests/test_kinesis/test_kinesis.py b/tests/test_kinesis/test_kinesis.py
index 6986f79fc..e2de866fc 100644
--- a/tests/test_kinesis/test_kinesis.py
+++ b/tests/test_kinesis/test_kinesis.py
@@ -15,7 +15,7 @@ from moto import mock_kinesis, mock_kinesis_deprecated
 def test_create_cluster():
     conn = boto.kinesis.connect_to_region("us-west-2")
 
-    conn.create_stream("my_stream", 2)
+    conn.create_stream("my_stream", 3)
 
     stream_response = conn.describe_stream("my_stream")
 
@@ -27,7 +27,7 @@ def test_create_cluster():
     stream["StreamStatus"].should.equal("ACTIVE")
 
     shards = stream['Shards']
-    shards.should.have.length_of(2)
+    shards.should.have.length_of(3)
 
 
 @mock_kinesis_deprecated