diff --git a/.travis.yml b/.travis.yml
index a55b700e7..2293bf983 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ env:
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     #utPLSQL released version directory
     - UTPLSQL_DIR="utPLSQL_latest_release"
+    - SELFTESTING_BRANCH="develop"
     - UTPLSQL_CLI_VERSION="3.1.0"
     # Maven
     - MAVEN_HOME=/usr/local/maven
diff --git a/VERSION b/VERSION
index 3cbc57657..962afe352 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.1.0-develop
+v3.1.1-develop
diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb
index d7d9a0813..5384afd45 100644
--- a/source/core/output_buffers/ut_output_table_buffer.tpb
+++ b/source/core/output_buffers/ut_output_table_buffer.tpb
@@ -69,8 +69,8 @@ create or replace type body ut_output_table_buffer is
     l_buffer_data        ut_varchar2_rows;
     l_already_waited_for number(10,2) := 0;
     l_finished           boolean := false;
-    lc_init_wait_sec     constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute
-    lc_max_wait_sec      constant naturaln := coalesce(a_timeout_sec, 60 * 60); -- 1 hour
+    lc_init_wait_sec     constant naturaln := coalesce(a_initial_timeout, 60 * 60 * 4 ); -- 4 hours
+    lc_max_wait_sec      constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours
     l_wait_for           integer := lc_init_wait_sec;
     lc_short_sleep_time  constant number(1,1) := 0.1; --sleep for 100 ms between checks
     lc_long_sleep_time   constant number(1) := 1;     --sleep for 1 s when waiting long