diff --git a/bytebuffer-collections/pom.xml b/bytebuffer-collections/pom.xml
index 7a11fed8b8e..108ac3cec0f 100755
--- a/bytebuffer-collections/pom.xml
+++ b/bytebuffer-collections/pom.xml
@@ -88,6 +88,11 @@
       <version>1.4.182</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava-testlib</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/bytebuffer-collections/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java b/bytebuffer-collections/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java
index 633a1de063a..a567c1b2966 100755
--- a/bytebuffer-collections/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java
+++ b/bytebuffer-collections/src/main/java/io/druid/collections/bitmap/WrappedImmutableBitSetBitmap.java
@@ -23,6 +23,7 @@ import org.roaringbitmap.IntIterator;
 
 import java.nio.ByteBuffer;
 import java.util.BitSet;
+import java.util.NoSuchElementException;
 
 /**
  * WrappedImmutableBitSetBitmap implements ImmutableBitmap for java.util.BitSet
@@ -117,18 +118,27 @@ public class WrappedImmutableBitSetBitmap implements ImmutableBitmap
 
   private class BitSetIterator implements IntIterator
   {
-    private int pos = -1;
+    private int nextPos;
+
+    BitSetIterator()
+    {
+      nextPos = bitmap.nextSetBit(0);
+    }
 
     @Override
     public boolean hasNext()
     {
-      return bitmap.nextSetBit(pos + 1) >= 0;
+      return nextPos >= 0;
     }
 
     @Override
     public int next()
     {
-      pos = bitmap.nextSetBit(pos + 1);
+      int pos = nextPos;
+      if (pos < 0) {
+        throw new NoSuchElementException();
+      }
+      nextPos = bitmap.nextSetBit(pos + 1);
       return pos;
     }
 
@@ -136,7 +146,7 @@ public class WrappedImmutableBitSetBitmap implements ImmutableBitmap
     public IntIterator clone()
     {
       BitSetIterator newIt = new BitSetIterator();
-      newIt.pos = pos;
+      newIt.nextPos = nextPos;
       return newIt;
     }
   }
diff --git a/bytebuffer-collections/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java b/bytebuffer-collections/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java
new file mode 100644
index 00000000000..0a08b5a7f3f
--- /dev/null
+++ b/bytebuffer-collections/src/test/java/io/druid/collections/bitmap/BitmapIterationTest.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to Metamarkets Group Inc. (Metamarkets) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Metamarkets licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.druid.collections.bitmap;
+
+import com.google.common.collect.UnmodifiableIterator;
+import com.google.common.collect.testing.CollectionTestSuiteBuilder;
+import com.google.common.collect.testing.SampleElements;
+import com.google.common.collect.testing.TestCollectionGenerator;
+import com.google.common.collect.testing.features.CollectionFeature;
+import com.google.common.collect.testing.features.CollectionSize;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.roaringbitmap.IntIterator;
+
+import java.util.AbstractCollection;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class BitmapIterationTest extends TestCase
+{
+  public static Test suite()
+  {
+    List<BitmapFactory> factories = Arrays.asList(
+        new BitSetBitmapFactory(),
+        new ConciseBitmapFactory()
+        // Roaring iteration fails because it doesn't throw NoSuchElementException on next() call when there are no more
+        // elements. Instead, it either throws NullPointerException or returns some unspecified value. If bitmap
+        // iterators are always used correctly in shouldn't be a problem, but if next() is occasionally called after
+        // hasNext() returned false and it returns some unspecified value, and everything continues to work without
+        // indication that there was a error, it would be a bug that is very hard to catch.
+        //
+        // This line should be uncommented when Druid updates RoaringBitmap dependency to a version which includes a fix
+        // for https://github.com/RoaringBitmap/RoaringBitmap/issues/129, or when RoaringBitmap is included into Druid
+        // as a module and the issue is fixed there.
+
+        //new RoaringBitmapFactory()
+    );
+
+    TestSuite suite = new TestSuite();
+    for (BitmapFactory factory : factories) {
+      suite.addTest(suiteForFactory(factory));
+    }
+    return suite;
+  }
+
+  private static Test suiteForFactory(BitmapFactory factory)
+  {
+    return CollectionTestSuiteBuilder
+        .using(new BitmapCollectionGenerator(factory))
+        .named("bitmap iteration tests of " + factory)
+        .withFeatures(CollectionFeature.KNOWN_ORDER)
+        .withFeatures(CollectionFeature.REJECTS_DUPLICATES_AT_CREATION)
+        .withFeatures(CollectionFeature.RESTRICTS_ELEMENTS)
+        .withFeatures(CollectionSize.ANY)
+        .createTestSuite();
+  }
+
+  private static class BitmapCollection extends AbstractCollection<Integer>
+  {
+    private final ImmutableBitmap bitmap;
+    private final int size;
+
+    private BitmapCollection(ImmutableBitmap bitmap, int size)
+    {
+      this.bitmap = bitmap;
+      this.size = size;
+    }
+
+    @Override
+    public UnmodifiableIterator<Integer> iterator()
+    {
+      final IntIterator iterator = bitmap.iterator();
+      return new UnmodifiableIterator<Integer>()
+      {
+        @Override
+        public boolean hasNext()
+        {
+          return iterator.hasNext();
+        }
+
+        @Override
+        public Integer next()
+        {
+          return iterator.next();
+        }
+      };
+    }
+
+    @Override
+    public int size()
+    {
+      return size;
+    }
+  }
+
+  private static class BitmapCollectionGenerator implements TestCollectionGenerator<Integer>
+  {
+    private final BitmapFactory factory;
+
+    private BitmapCollectionGenerator(BitmapFactory factory)
+    {
+      this.factory = factory;
+    }
+
+    @Override
+    public SampleElements<Integer> samples()
+    {
+      return new SampleElements.Ints();
+    }
+
+    @Override
+    public BitmapCollection create(Object... objects)
+    {
+      MutableBitmap mutableBitmap = factory.makeEmptyMutableBitmap();
+      for (Object element : objects) {
+        mutableBitmap.add(((Integer) element));
+      }
+      return new BitmapCollection(factory.makeImmutableBitmap(mutableBitmap), objects.length);
+    }
+
+    @Override
+    public Integer[] createArray(int n)
+    {
+      return new Integer[n];
+    }
+
+    @Override
+    public Iterable<Integer> order(List<Integer> list)
+    {
+      Collections.sort(list);
+      return list;
+    }
+  }
+}
diff --git a/pom.xml b/pom.xml
index ee2c741478e..23752585333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
 
     <properties>
         <apache.curator.version>2.11.0</apache.curator.version>
+        <guava.version>16.0.1</guava.version>
         <guice.version>4.1.0</guice.version>
         <jetty.version>9.2.5.v20141112</jetty.version>
         <jersey.version>1.19</jersey.version>
@@ -252,7 +253,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>16.0.1</version>
+                <version>${guava.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
@@ -660,6 +661,12 @@
                 <version>1.0.4</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava-testlib</artifactId>
+                <version>${guava.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>