diff --git a/core/src/test/java/org/elasticsearch/index/query/PercolatorQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/PercolatorQueryBuilderTests.java
index a713b2356a6..bafdc6225c0 100644
--- a/core/src/test/java/org/elasticsearch/index/query/PercolatorQueryBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/PercolatorQueryBuilderTests.java
@@ -80,9 +80,9 @@ public class PercolatorQueryBuilderTests extends AbstractQueryTestCase<Percolato
     }
 
     /**
-     * prevent fields in the "document" field from being shuffled randomly, because it later is parsed to
-     * a {@link BytesReference} and even though the documents are the same, equals will fail when comparing
-     * BytesReference
+     * we don't want to shuffle the "document" field internally in {@link #testFromXContent()} because even though the
+     * documents would be functionally the same, their {@link BytesReference} representation isn't and thats what we
+     * compare when check for equality of the original and the shuffled builder
      */
     @Override
     protected Set<String> shuffleProtectedFields() {
diff --git a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java
index 46f867cb79b..02ac6dcbf52 100644
--- a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java
+++ b/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java
@@ -18,8 +18,6 @@
  */
 package org.elasticsearch.search;
 
-import java.io.IOException;
-
 import org.elasticsearch.common.inject.ModuleTestCase;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.settings.Settings;
@@ -31,9 +29,10 @@ import org.elasticsearch.search.highlight.CustomHighlighter;
 import org.elasticsearch.search.highlight.Highlighter;
 import org.elasticsearch.search.highlight.PlainHighlighter;
 import org.elasticsearch.search.suggest.CustomSuggester;
-import org.elasticsearch.search.suggest.Suggester;
 import org.elasticsearch.search.suggest.phrase.PhraseSuggester;
 
+import java.io.IOException;
+
 import static org.hamcrest.Matchers.containsString;
 /**
  */
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
index 9286062698c..e674c998edf 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
@@ -622,7 +622,7 @@ public abstract class ESTestCase extends LuceneTestCase {
     private static Map<String, Object> shuffleMap(Map<String, Object> map, Set<String> exceptFieldNames) {
         List<String> keys = new ArrayList<>(map.keySet());
         // even though we shuffle later, we need this to make tests reproduce on different jvms
-        //Collections.sort(keys);
+        Collections.sort(keys);
         Map<String, Object> targetMap = new TreeMap<>();
         Collections.shuffle(keys, random());
         for (String key : keys) {