See if we can get the stateful timeout tests under the 2+ hours
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 4c946b6..6b940a2 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -89,6 +89,7 @@
-Djava.naming.factory.initial=org.apache.openejb.client.LocalInitialContextFactory \
-Dopenejb.deploymentId.format={appId}/{ejbJarId}/{ejbName} \
-Dcts.tmp=$harness.temp.directory \
+ -Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds} \
-Djava.util.logging.config.file=${javaee.home}/domains/domain1/config/logging.properties \
-Ddeliverable.class=${deliverable.class} \
$testExecuteClass \
@@ -221,7 +222,8 @@
securedWebServicePort=%webcontainer.default.ssl.port%
-test.ejb.stateful.timeout.wait.seconds=660
+# timeout configuration is 4 minutes so we should be good
+test.ejb.stateful.timeout.wait.seconds=60
harness.log.port=%harness.log.port%
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 546122c..3d1ed81 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -232,7 +232,7 @@
def containerJavaOpts = get('container.java.opts', "")
// force memory on tasks because with JDK 8 it's computed with a bit too much
- containerJavaOpts += " -Xmx512m"
+ containerJavaOpts += " -Xmx512m -Dtest.ejb.stateful.timeout.wait.seconds=60"
if (options.contains('security')) {
diff --git a/src/test/tomee-plume/conf/tomee.xml b/src/test/tomee-plume/conf/tomee.xml
index 70b638e..90f45b3 100644
--- a/src/test/tomee-plume/conf/tomee.xml
+++ b/src/test/tomee-plume/conf/tomee.xml
@@ -28,7 +28,9 @@
<Container id="StatefulContainer" ctype="STATEFUL">
Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
+ #TimeOut 20
+ TimeOut 4
+ Frequency 10
BulkPassivate 50
</Container>
