diff --git a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
index 7255ce00405..eaf800cd529 100644
--- a/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
+++ b/server/src/test/java/com/metamx/druid/index/brita/SpatialFilterTest.java
@@ -2,8 +2,13 @@ package com.metamx.druid.index.brita;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.metamx.common.spatial.rtree.ImmutableRTree;
+import com.metamx.common.spatial.rtree.RTree;
 import com.metamx.common.spatial.rtree.search.RadiusBound;
+import com.metamx.common.spatial.rtree.split.LinearGutmanSplitStrategy;
 import com.metamx.druid.Druids;
 import com.metamx.druid.QueryGranularity;
 import com.metamx.druid.TestHelper;
@@ -24,6 +29,7 @@ import com.metamx.druid.query.timeseries.TimeseriesQuery;
 import com.metamx.druid.query.timeseries.TimeseriesQueryRunnerFactory;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.TimeseriesResultValue;
+import junit.framework.Assert;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.junit.Test;
@@ -32,6 +38,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
+import java.util.Set;
 
 /**
  */
@@ -86,7 +94,7 @@ public class SpatialFilterTest
     );
     theIndex.add(
         new MapBasedInputRow(
-            new DateTime("2013-01-03").getMillis(),
+            new DateTime("2013-01-04").getMillis(),
             dims,
             ImmutableMap.<String, Object>of(
                 "timestamp", new DateTime("2013-01-03").toString(),
@@ -96,6 +104,39 @@ public class SpatialFilterTest
             )
         )
     );
+    theIndex.add(
+        new MapBasedInputRow(
+            new DateTime("2013-01-05").getMillis(),
+            dims,
+            ImmutableMap.<String, Object>of(
+                "timestamp", new DateTime("2013-01-03").toString(),
+                "dim", "foo",
+                "dim.geo", Arrays.asList(8.0f, 6.0f),
+                "val", 47l
+            )
+        )
+    );
+
+    // Add a bunch of random points
+    Random rand = new Random();
+    for (int i = 5; i < 5000; i++) {
+      theIndex.add(
+          new MapBasedInputRow(
+              new DateTime("2013-01-01").getMillis(),
+              dims,
+              ImmutableMap.<String, Object>of(
+                  "timestamp",
+                  new DateTime("2013-01-01").toString(),
+                  "dim",
+                  "boo",
+                  "dim.geo",
+                  Arrays.asList((float) (rand.nextFloat() * 10 + 10.0), (float) (rand.nextFloat() * 10 + 10.0)),
+                  "val",
+                  i
+              )
+          )
+      );
+    }
 
     File tmpFile = File.createTempFile("billy", "yay");
     tmpFile.delete();
@@ -113,7 +154,12 @@ public class SpatialFilterTest
                                   .dataSource("test")
                                   .granularity(QueryGranularity.ALL)
                                   .intervals(Arrays.asList(new Interval("2013-01-01/2013-01-07")))
-                                  .filters(new SpatialDimFilter("dim.geo", new RadiusBound(new float[]{0.0f, 0.0f}, 5)))
+                                  .filters(
+                                      new SpatialDimFilter(
+                                          "dim.geo",
+                                          new RadiusBound(new float[]{0.0f, 0.0f}, 5)
+                                      )
+                                  )
                                   .aggregators(
                                       Arrays.<AggregatorFactory>asList(
                                           new CountAggregatorFactory("rows"),
@@ -146,4 +192,86 @@ public class SpatialFilterTest
       throw Throwables.propagate(e);
     }
   }
+
+  @Test
+  public void testSpatialQueryMorePoints()
+  {
+    TimeseriesQuery query = Druids.newTimeseriesQueryBuilder()
+                                  .dataSource("test")
+                                  .granularity(QueryGranularity.DAY)
+                                  .intervals(Arrays.asList(new Interval("2013-01-01/2013-01-07")))
+                                  .filters(
+                                      new SpatialDimFilter(
+                                          "dim.geo",
+                                          new RadiusBound(new float[]{0.0f, 0.0f}, 10)
+                                      )
+                                  )
+                                  .aggregators(
+                                      Arrays.<AggregatorFactory>asList(
+                                          new CountAggregatorFactory("rows"),
+                                          new LongSumAggregatorFactory("val", "val")
+                                      )
+                                  )
+                                  .build();
+
+    List<Result<TimeseriesResultValue>> expectedResults = Arrays.asList(
+        new Result<TimeseriesResultValue>(
+            new DateTime("2013-01-01T00:00:00.000Z"),
+            new TimeseriesResultValue(
+                ImmutableMap.<String, Object>builder()
+                            .put("rows", 1L)
+                            .put("val", 17l)
+                            .build()
+            )
+        ),
+        new Result<TimeseriesResultValue>(
+            new DateTime("2013-01-02T00:00:00.000Z"),
+            new TimeseriesResultValue(
+                ImmutableMap.<String, Object>builder()
+                            .put("rows", 1L)
+                            .put("val", 29l)
+                            .build()
+            )
+        ),
+        new Result<TimeseriesResultValue>(
+            new DateTime("2013-01-03T00:00:00.000Z"),
+            new TimeseriesResultValue(
+                ImmutableMap.<String, Object>builder()
+                            .put("rows", 1L)
+                            .put("val", 13l)
+                            .build()
+            )
+        ),
+        new Result<TimeseriesResultValue>(
+            new DateTime("2013-01-04T00:00:00.000Z"),
+            new TimeseriesResultValue(
+                ImmutableMap.<String, Object>builder()
+                            .put("rows", 1L)
+                            .put("val", 91l)
+                            .build()
+            )
+        ),
+        new Result<TimeseriesResultValue>(
+            new DateTime("2013-01-05T00:00:00.000Z"),
+            new TimeseriesResultValue(
+                ImmutableMap.<String, Object>builder()
+                            .put("rows", 1L)
+                            .put("val", 47l)
+                            .build()
+            )
+        )
+    );
+    try {
+      TimeseriesQueryRunnerFactory factory = new TimeseriesQueryRunnerFactory();
+      QueryRunner runner = new FinalizeResultsQueryRunner(
+          factory.createRunner(new QueryableIndexSegment(null, makeIndex())),
+          factory.getToolchest()
+      );
+
+      TestHelper.assertExpectedResults(expectedResults, runner.run(query));
+    }
+    catch (Exception e) {
+      throw Throwables.propagate(e);
+    }
+  }
 }