Index: tck2/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(revision 566777)
+++ tck2/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(working copy)
@@ -62,7 +62,7 @@
         Query query = getPM().newNamedQuery(Person.class, "changeQuery");
         
         // change query
-        query.setResult("firstname, lastname");
+        query.setResult("DISTINCT firstname, lastname");
         query.setResultClass(FullName.class);
         query.setClass(FullTimeEmployee.class);
         String filter = "salary > 1000 & projects.contains(p) & " +
@@ -73,14 +73,15 @@
         query.declareImports(imports);
         query.declareVariables("Project p");
         query.declareParameters("BigDecimal limit");
-        query.setOrdering("personid ASCENDING");
+        query.setOrdering("firstname, lastname ASCENDING");
         query.setRange(0, 5);
         String singleStringQuery = 
-            "SELECT firstname, lastname INTO FullName FROM FullTimeEmployee " +
+            "SELECT DISTINCT firstname, lastname " +
+            "INTO FullName FROM FullTimeEmployee " +
             "WHERE salary > 1000 & projects.contains(p) & " +
             "p.budget > limit " +
             "VARIABLES Project p PARAMETERS BigDecimal limit " +
-            "ORDER BY personid ASCENDING RANGE 0, 5";
+            "ORDER BY firstname, lastname ASCENDING RANGE 0, 5";
 
         // query parameters
         Object[] parameters = {new BigDecimal("2000")};        
Index: tck2-legacy/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java
===================================================================
--- tck2-legacy/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(revision 566777)
+++ tck2-legacy/src/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(working copy)
@@ -62,7 +62,7 @@
         Query query = getPM().newNamedQuery(Person.class, "changeQuery");
         
         // change query
-        query.setResult("firstname, lastname");
+        query.setResult("DISTINCT firstname, lastname");
         query.setResultClass(FullName.class);
         query.setClass(FullTimeEmployee.class);
         String filter = "salary > 1000 & projects.contains(p) & " +
@@ -73,14 +73,15 @@
         query.declareImports(imports);
         query.declareVariables("Project p");
         query.declareParameters("BigDecimal limit");
-        query.setOrdering("personid ASCENDING");
+        query.setOrdering("firstname, lastname ASCENDING");
         query.setRange(0, 5);
         String singleStringQuery = 
-            "SELECT firstname, lastname INTO FullName FROM FullTimeEmployee " +
+            "SELECT DISTINCT firstname, lastname " +
+            "INTO FullName FROM FullTimeEmployee " +
             "WHERE salary > 1000 & projects.contains(p) & " +
             "p.budget > limit " +
             "VARIABLES Project p PARAMETERS BigDecimal limit " +
-            "ORDER BY personid ASCENDING RANGE 0, 5";
+            "ORDER BY firstname, lastname ASCENDING RANGE 0, 5";
 
         // query parameters
         Object[] parameters = {new BigDecimal("2000")};