diff --git a/.travis.yml b/.travis.yml
index d50c5ea..c636c63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,13 +40,8 @@ install:
   - if [ "$CXX" == "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi
   - if [ "$CXX" == "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi
   - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then  brew update;  fi
 
-
-
-script:
- - echo ${TRAVIS_OS_NAME};
- - if [ ${TRAVIS_OS_NAME} = 'osx' ]; then  brew update;  fi
- - if [ "$CXX" = "g++" ]; then export CXX=g++-4.8; fi
- - if [ "$CXX" = "clang++" ]; then export CXX=clang++-3.4; fi
- - ./scripts/buildAndRunTests.sh
+ 
+script: "./scripts/buildAndRunTests.sh"
  
diff --git a/scripts/buildAndRunTests.sh b/scripts/buildAndRunTests.sh
index 8c45401..355b284 100755
--- a/scripts/buildAndRunTests.sh
+++ b/scripts/buildAndRunTests.sh
@@ -3,11 +3,17 @@
 set -ev
 
 unzip -o 3rdParty/gtest/gtest-1.7.0.zip -d 3rdParty/gtest
-mkdir  build_travis
-cd build_travis
+
+
+if [ "$CXX" = "g++" ]; then export CXX=g++-4.8; fi
+if [ "$CXX" = "clang++" ]; then export CXX=clang++-3.4; fi
 echo $TRAVIS_OS_NAME
 echo $CXX
 
+
+mkdir  build_travis
+cd build_travis
+
 if [ "$CXX" = "g++-4.8" ]
 then
    echo "Testing with g++"