diff --git a/.travis.yml b/.travis.yml
index 4f72e2ca33618d34c16abbbc3949fa3a790ffd59..16432dac0cf9121a74f6a7ecae462b22973461a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ before_install:
     function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
 script:
   - |
-    timeout 2580 paddle/scripts/travis/${JOB}.sh -e "WITH_GOLANG=ON"  # 43min timeout
+    export WITH_GOLANG=ON && timeout 2580 paddle/scripts/travis/${JOB}.sh # 43min timeout
     RESULT=$?; if [ $RESULT -eq 0 ] || [ $RESULT -eq 142 ]; then true; else false; fi;
 notifications:
   email:
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index a182e5f4aef9de8c6f20681328d5ba6c0e6944ef..1ccee686df4faa930dcaba0d38f7571c9aaadd4a 100644
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -3,7 +3,7 @@
 set -xe
 
 # Set BASE_IMAGE according to env variables
-if [ ${WITH_GPU} == "ON" ]; then
+if [[ ${WITH_GPU} == "ON" ]]; then
   BASE_IMAGE="nvidia/cuda:8.0-cudnn5-runtime-ubuntu16.04"
 else
   BASE_IMAGE="ubuntu:16.04"