diff --git a/test/unit/org/apache/cassandra/service/StorageServiceTest.java b/test/unit/org/apache/cassandra/service/StorageServiceTest.java
index 33c9befb78..f8a6e90c42 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceTest.java
@@ -324,6 +324,13 @@ public class StorageServiceTest extends TestBaseImpl
         assertEquals(4, result);
     }
 
+    @Test
+    public void calculateSplitCount_ZeroRowCount_ReturnsMinimumOfOne()
+    {
+        int result = StorageService.calculateSplitCount(1, 0, 40);
+        assertEquals(1, result);
+    }
+
     @Test
     public void calculateSplitCount_ForLargeRowCount_LimitsResult()
     {