diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java
index 7df2798..2490534 100644
--- a/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/integration/QueryableStateIntegrationTest.java
@@ -152,7 +152,8 @@
             @Override
             public int compare(final KeyValue<String, String> o1,
                                final KeyValue<String, String> o2) {
-                return o1.key.compareTo(o2.key);
+                final int keyComparison = o1.key.compareTo(o2.key);
+                return keyComparison != 0 ? keyComparison : o1.value.compareTo(o2.value);
             }
         };
         stringLongComparator = new Comparator<KeyValue<String, Long>>() {
@@ -160,7 +161,8 @@
             @Override
             public int compare(final KeyValue<String, Long> o1,
                                final KeyValue<String, Long> o2) {
-                return o1.key.compareTo(o2.key);
+                final int keyComparison =  o1.key.compareTo(o2.key);
+                return keyComparison != 0 ? keyComparison : o1.value.compareTo(o2.value);
             }
         };
         inputValues = Arrays.asList(
