Index: src/java/org/apache/jdo/tck/query/QueryTest.java
===================================================================
--- src/java/org/apache/jdo/tck/query/QueryTest.java	(revision 613998)
+++ src/java/org/apache/jdo/tck/query/QueryTest.java	(working copy)
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.jdo.JDOException;
 import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
@@ -1303,8 +1304,14 @@
             }
         } catch (JDOUserException e) {
             if (positive) {
-                throw e;
+                String msg = "JDOUserException thrown while executing query:\n" +
+                        singleStringQuery;
+                throw new JDOException(msg, e);
             }
+        } catch (JDOException e) {
+            String msg = "JDOException thrown while executing query:\n" +
+                    singleStringQuery;
+            throw new JDOException(msg, e);
         } finally {
             if (tx.isActive()) {
                 tx.rollback();
@@ -1454,8 +1461,14 @@
             tx.commit();
         } catch (JDOUserException e) {
             if (positive) {
-                throw e;
+                String msg = "JDOUserException thrown while executing query:\n" +
+                        singleStringQuery;
+                throw new JDOException(msg, e);
             }
+        } catch (JDOException e) {
+            String msg = "JDOException thrown while executing query:\n" +
+                    singleStringQuery;
+            throw new JDOException(msg, e);
         } finally {
             if (tx.isActive()) {
                 tx.rollback();