diff --git a/.gitignore b/.gitignore
index 7c966cd6f..da126305e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ ivy/ivy*.jar
 test_lucene_index_employee
 test_lucene_index_webpage/
 test_lucene_index_employeeint/
+flaky-test/
diff --git a/flaky-test b/flaky-test
new file mode 160000
index 000000000..cc01c182e
--- /dev/null
+++ b/flaky-test
@@ -0,0 +1 @@
+Subproject commit cc01c182e9fbf839ac79f66142cf9cbd9f1596c5
diff --git a/gora-ignite/src/test/java/org/apache/gora/ignite/store/TestIgniteStore.java b/gora-ignite/src/test/java/org/apache/gora/ignite/store/TestIgniteStore.java
index 3eeb13825..c9a7115f9 100644
--- a/gora-ignite/src/test/java/org/apache/gora/ignite/store/TestIgniteStore.java
+++ b/gora-ignite/src/test/java/org/apache/gora/ignite/store/TestIgniteStore.java
@@ -1,23 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF 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 org.apache.gora.ignite.store;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
+
 import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
 import org.apache.gora.ignite.GoraIgniteTestDriver;
 import org.apache.gora.store.DataStoreMetadataFactory;
@@ -31,27 +18,39 @@
  */
 public class TestIgniteStore extends DataStoreTestBase {
 
-  static {
-    setTestDriver(new GoraIgniteTestDriver());
-  }
-
-  @Test
-  public void igniteStoreMetadataAnalyzerTest() throws Exception {
-    DataStoreMetadataAnalyzer createAnalyzer = DataStoreMetadataFactory.createAnalyzer(DataStoreTestBase.testDriver.getConfiguration());
-    Assert.assertEquals("Ignite Store Metadata Type", "IGNITE", createAnalyzer.getType());
-    Assert.assertTrue("Ignite Store Metadata Table Names", createAnalyzer.getTablesNames().equals(Lists.newArrayList("WEBPAGE", "EMPLOYEE")));
-    IgniteTableMetadata tableInfo = (IgniteTableMetadata) createAnalyzer.getTableInfo("EMPLOYEE");
-    Assert.assertEquals("Ignite Store Metadata Table Primary Key Column", "PKSSN", tableInfo.getPrimaryKey());
-    Assert.assertEquals("Ignite Store Metadata Table Primary Key Type", "VARCHAR", tableInfo.getPrimaryKeyType());
-    HashMap<String, String> hmap = new HashMap();
-    hmap.put("WEBPAGE", "VARBINARY");
-    hmap.put("BOSS", "VARBINARY");
-    hmap.put("SALARY", "INTEGER");
-    hmap.put("DATEOFBIRTH", "BIGINT");
-    hmap.put("VALUE", "VARCHAR");
-    hmap.put("NAME", "VARCHAR");
-    hmap.put("SSN", "VARCHAR");
-    Assert.assertTrue("Ignite Store Metadata Table Columns", tableInfo.getColumns().equals(hmap));
-  }
+    static {
+        setTestDriver(new GoraIgniteTestDriver());
+    }
+
+    @Test
+    public void igniteStoreMetadataAnalyzerTest() throws Exception {
+        DataStoreMetadataAnalyzer createAnalyzer = DataStoreMetadataFactory.createAnalyzer(DataStoreTestBase.testDriver.getConfiguration());
+        Assert.assertEquals("Ignite Store Metadata Type", "IGNITE", createAnalyzer.getType());
+        Assert.assertTrue("Ignite Store Metadata Table Names", createAnalyzer.getTablesNames().equals(Lists.newArrayList("WEBPAGE", "EMPLOYEE")));
+        IgniteTableMetadata tableInfo = (IgniteTableMetadata) createAnalyzer.getTableInfo("EMPLOYEE");
+        Assert.assertEquals("Ignite Store Metadata Table Primary Key Column", "PKSSN", tableInfo.getPrimaryKey());
+        Assert.assertEquals("Ignite Store Metadata Table Primary Key Type", "VARCHAR", tableInfo.getPrimaryKeyType());
+        HashMap<String, String> hmap = new HashMap<>();
+        hmap.put("WEBPAGE", "VARBINARY");
+        hmap.put("BOSS", "VARBINARY");
+        hmap.put("SALARY", "INTEGER");
+        hmap.put("DATEOFBIRTH", "BIGINT");
+        hmap.put("VALUE", "VARCHAR");
+        hmap.put("NAME", "VARCHAR");
+        hmap.put("SSN", "VARCHAR");
+        Assert.assertTrue("Ignite Store Metadata Table Columns", tableInfo.getColumns().equals(hmap));
+    }
+
+    @Test
+    public void testQueryKeyRange() throws Exception {
+        List<Long> keys = new ArrayList<>();
+        while (result.next()) {
+            keys.add(result.getKey());
+        }
+
+        // FIX: enforce deterministic ordering
+        Collections.sort(keys);
 
+        assertEquals(Arrays.asList(2L, 3L, 4L), keys);
+    }
 }