Index: src/java/org/apache/jdo/tck/query/result/AggregateResult.java
===================================================================
--- src/java/org/apache/jdo/tck/query/result/AggregateResult.java	(revision 1044264)
+++ src/java/org/apache/jdo/tck/query/result/AggregateResult.java	(working copy)
@@ -558,7 +558,7 @@
         // MAX(((FullTimeEmployee)manager).salary)
         new Double(10000),
         // AVG(long)
-        new Long(3),
+        new Double(3),
         // AVG(double)
         new Double(25000.0),
         // AVG(BigDecimal)
Index: src/java/org/apache/jdo/tck/query/result/ResultExpressions.java
===================================================================
--- src/java/org/apache/jdo/tck/query/result/ResultExpressions.java	(revision 1044264)
+++ src/java/org/apache/jdo/tck/query/result/ResultExpressions.java	(working copy)
@@ -415,7 +415,7 @@
         // MAX
         new Long(5),
         // AVG
-        new Long(3),
+        new Double(3),
         // field expression
         Arrays.asList(new Object[]{new Long(2), new Long(3), 
                 new Long(4), new Long(5), new Long(6)}),