diff --git a/tools/runners/run-test-pass.sh b/tools/runners/run-test-pass.sh
index 0b1451376e..cd457a42aa 100755
--- a/tools/runners/run-test-pass.sh
+++ b/tools/runners/run-test-pass.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TIMEOUT=${TIMEOUT:=5}
+TIMEOUT=${TIMEOUT:=30}
 
 START_DIR=`pwd`
 
diff --git a/tools/runners/run-test-xfail.sh b/tools/runners/run-test-xfail.sh
index c9adcbcb4d..d4142de3e7 100755
--- a/tools/runners/run-test-xfail.sh
+++ b/tools/runners/run-test-xfail.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TIMEOUT=${TIMEOUT:=5}
+TIMEOUT=${TIMEOUT:=30}
 
 START_DIR=`pwd`