diff --git a/.travis.yml b/.travis.yml
index b2c2e63a881..845ac9bbd8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,8 @@ before_install:
   - sudo dpkg -i bazel_${BAZEL_VERSION}-linux-x86_64.deb
   - sudo apt-get -f install -qqy uuid-dev
   - cd ${TRAVIS_BUILD_DIR}
-  - mv .bazelrc.travis .bazelrc
+  - mv tools/bazel.rc tools/bazel.rc.orig
+  - cat tools/bazel.rc.travis tools/bazel.rc.orig > tools/bazel.rc
 
 script:
   - script/check-style
diff --git a/Jenkinsfile b/Jenkinsfile
index 6575dc498f5..c1aa89e3f25 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('testutils@stable-63c264e')
+@Library('testutils@stable-3e4d089')
 
 import org.istio.testutils.Utilities
 import org.istio.testutils.GitUtilities
diff --git a/.bazelrc.jenkins b/tools/bazel.rc.jenkins
similarity index 100%
rename from .bazelrc.jenkins
rename to tools/bazel.rc.jenkins
diff --git a/.bazelrc.travis b/tools/bazel.rc.travis
similarity index 100%
rename from .bazelrc.travis
rename to tools/bazel.rc.travis