diff --git a/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
index a36bf3d6b62..57710a31e01 100644
--- a/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
+++ b/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
@@ -218,11 +218,11 @@ public class TestGrouping extends LuceneTestCase {
     };
   }
 
-  private Comparable[] fillFields(GroupDoc d, Sort sort) {
+  private Comparable<?>[] fillFields(GroupDoc d, Sort sort) {
     final SortField[] sortFields = sort.getSort();
-    final Comparable[] fields = new Comparable[sortFields.length];
+    final Comparable<?>[] fields = new Comparable[sortFields.length];
     for(int fieldIDX=0;fieldIDX<sortFields.length;fieldIDX++) {
-      final Comparable c;
+      final Comparable<?> c;
       final SortField sf = sortFields[fieldIDX];
       if (sf.getField().equals("sort1")) {
         c = d.sort1;
@@ -254,7 +254,7 @@ public class TestGrouping extends LuceneTestCase {
     Arrays.sort(groupDocs, groupSortComp);
     final HashMap<BytesRef,List<GroupDoc>> groups = new HashMap<BytesRef,List<GroupDoc>>();
     final List<BytesRef> sortedGroups = new ArrayList<BytesRef>();
-    final List<Comparable[]> sortedGroupFields = new ArrayList<Comparable[]>();
+    final List<Comparable<?>[]> sortedGroupFields = new ArrayList<Comparable<?>[]>();
 
     int totalHitCount = 0;
 
@@ -516,7 +516,7 @@ public class TestGrouping extends LuceneTestCase {
       final GroupDocs expectedGroup = expected.groups[groupIDX];
       final GroupDocs actualGroup = actual.groups[groupIDX];
       assertEquals(expectedGroup.groupValue, actualGroup.groupValue);
-      assertEquals(expectedGroup.groupSortValues, actualGroup.groupSortValues);
+      assertArrayEquals(expectedGroup.groupSortValues, actualGroup.groupSortValues);
 
       // TODO
       // assertEquals(expectedGroup.maxScore, actualGroup.maxScore);
@@ -532,7 +532,7 @@ public class TestGrouping extends LuceneTestCase {
         assertEquals(expectedFD.doc, docIDtoID[actualFD.doc]);
         // TODO
         // assertEquals(expectedFD.score, actualFD.score);
-        assertEquals(expectedFD.fields, actualFD.fields);
+        assertArrayEquals(expectedFD.fields, actualFD.fields);
       }
     }
   }