diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 8f3b7a313..146b4abdf 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -7,15 +7,15 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  KIND, either express or implied.  See the License for the
  specific language governing permissions and limitations
- under the License.   
+ under the License.
 -->
 
 <!--
@@ -41,6 +41,9 @@
     but you can also test against prior levels by setting:
         -Dtck2.level=20091209
 
+    To set the TCK run time limit, use the "jpatck.run.tmo" system property to
+    specify the timeout value in milliseconds. Default to 7200000 (2 hours).
+
     To run a specific package of tests, use the "jpatck.pkg.dir" system
     property to specify the parent directory of the tests you want to run.
     E.g.:
@@ -61,8 +64,8 @@
     5. Run the TCK script
     6. Parse the TCK result log to determine whether to fail the build or not
 -->
-<!-- 
-    Please keep the project tag on one line to avoid confusing 
+<!--
+    Please keep the project tag on one line to avoid confusing
     the release plugin.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -298,7 +301,7 @@ report.dir=${jpatck.reports.dir}
 jpa.classes=${cp.property}
 database.classes=${jpa.classes}
 # Need to specify java.* classes, both in Windows/UNIX locations as well as Mac.
-# This includes a few different possible locations; only one of them needs to 
+# This includes a few different possible locations; only one of them needs to
 # actually work for a given environment.
 sigTestClasspath=${JAVA_HOME}/lib/rt.jar${path.separator}${JAVA_HOME}/jre/lib/rt.jar${path.separator}${JAVA_HOME}/../Classes/classes.jar${path.separator}$${jpa.classes}
 persistence.unit.properties.file.full.path=${openjpa.properties}
@@ -311,7 +314,7 @@ databaseName=${db.name}
                         </echo>
 
                         <!-- convert backslashes and known paths with spaces
-                            to get around a problem with the TCK testrunner 
+                            to get around a problem with the TCK testrunner
                             on windows -->
                         <echo>Update directory paths if running on Windows</echo>
                         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
diff --git a/openjpa-integration/tck/tck2-20101205.xml b/openjpa-integration/tck/tck2-20101205.xml
index c93b5d436..912a30be3 100644
--- a/openjpa-integration/tck/tck2-20101205.xml
+++ b/openjpa-integration/tck/tck2-20101205.xml
@@ -7,15 +7,15 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  KIND, either express or implied.  See the License for the
  specific language governing permissions and limitations
- under the License.   
+ under the License.
 -->
 
 <!--
@@ -38,8 +38,8 @@
 
     Other options are documented in the Maven pom.xml which calls this script.
 -->
-<!-- 
-    Please keep the project tag on one line to avoid confusing 
+<!--
+    Please keep the project tag on one line to avoid confusing
     the release plugin.
 -->
 <project name="JPA2TCK" default="run-tck">
@@ -142,7 +142,7 @@ database.classes=
 openjpa.properties=${openjpa.properties}
 toplink.properties=${toplink.properties}
 # Need to specify java.* classes, both in Windows/UNIX locations as well as Mac.
-# This includes a few different possible locations; only one of them needs to 
+# This includes a few different possible locations; only one of them needs to
 # actually work for a given environment.
 sigTestClasspath=${JAVA_HOME}/lib/rt.jar${path.separator}${JAVA_HOME}/jre/lib/rt.jar${path.separator}${JAVA_HOME}/../Classes/classes.jar${path.separator}$${jpa.classes}
 persistence.unit.properties.file.full.path=${provider.properties}
@@ -155,7 +155,7 @@ databaseName=${db.name}
         </echo>
 
         <!-- convert backslashes and known paths with spaces
-            to get around a problem with the TCK testrunner 
+            to get around a problem with the TCK testrunner
             on windows -->
         <echo>Update directory paths if running on Windows</echo>
         <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
@@ -209,8 +209,9 @@ databaseName=${db.name}
         <attribute name="dir" default="${tck.dir}/src" />
         <attribute name="buildfile" />
         <attribute name="target" />
+        <attribute name="tmo" default="7200000" />
         <sequential>
-            <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="false" dir="@{dir}" append="true" output="${tck.log}" timeout="7200000" resultproperty="tsant.result">
+            <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="false" dir="@{dir}" append="true" output="${tck.log}" timeout="@{tmo}" resultproperty="tsant.result">
                 <arg value="-emacs" />
                 <arg value="-buildfile" />
                 <arg value="@{buildfile}" />
@@ -311,17 +312,18 @@ databaseName=${db.name}
         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
         <echo>TCK initdb.xml returned result=${tsant.result}</echo>
 
+        <property name="jpatck.run.tmo" value="7200000" />
         <!-- now run the TCK -->
         <if>
             <isset property="jpatck.pkg.dir" />
         <then>
             <echo>Calling TCK build.xml for pkg.dir=${jpatck.pkg.dir}</echo>
             <property name="dir" value="${tck.dir}/src/${jpatck.pkg.dir}" />
-            <tsant dir="${dir}" buildfile="${dir}/build.xml" target="runclient" />
+            <tsant dir="${dir}" buildfile="${dir}/build.xml" target="runclient" tmo="${jpatck.run.tmo}" />
         </then>
         <else>
             <echo>Calling TCK build.xml for ALL tests</echo>
-            <tsant buildfile="${tck.dir}/bin/build.xml" target="run.all.tests" />
+            <tsant buildfile="${tck.dir}/bin/build.xml" target="run.all.tests" tmo="${jpatck.run.tmo}" />
         </else>
         </if>
 
@@ -330,7 +332,7 @@ databaseName=${db.name}
         <!-- archive the results and check for test failures -->
         <antcall target="zip-artifacts">
             <param name="results.name" value="tck" />
-        </antcall> 
+        </antcall>
     </target>