diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
index b13e7c8df..aa255362d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
@@ -306,6 +306,7 @@ public class DB2Dictionary
             break;
         case  db2ZOSV8xOrLater:
             // DB2 Z/OS 
+            supportsQueryTimeout = false;  // can only be set to 0 on z/OS
             characterColumnSize = 255;
             lastGeneratedKeyQuery = "SELECT IDENTITY_VAL_LOCAL() FROM "
                 + "SYSIBM.SYSDUMMY1";
@@ -410,7 +411,6 @@ public class DB2Dictionary
        return (databaseProductVersion.indexOf("DSN") != -1
             || databaseProductName.indexOf("DB2/") == -1)
             && maj >= 8;
-           
     }
 
     public boolean isDB2ISeriesV5R3OrEarlier() {