diff --git a/ci/travis_linux_before_install b/ci/travis_linux_before_install
index 8c417ba6f2..05495ccdf1 100755
--- a/ci/travis_linux_before_install
+++ b/ci/travis_linux_before_install
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" >> /etc/apt/sources.list'
 wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
diff --git a/ci/travis_linux_install b/ci/travis_linux_install
index 74714a8148..1613487f8b 100755
--- a/ci/travis_linux_install
+++ b/ci/travis_linux_install
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 sudo apt-get remove -y llvm-*
 sudo rm -rf /usr/local/*
 sudo apt-get install -y clang-5.0 libclang-5.0 libclang-5.0-dev llvm-5.0 llvm-5.0-dev liblld-5.0 liblld-5.0-dev cmake
diff --git a/ci/travis_linux_script b/ci/travis_linux_script
index dc72e0742a..d841127fbf 100755
--- a/ci/travis_linux_script
+++ b/ci/travis_linux_script
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 export CC=clang-5.0
 export CXX=clang++-5.0
 which $CC
diff --git a/ci/travis_osx_before_install b/ci/travis_osx_before_install
index 943babef1f..dba0d46734 100755
--- a/ci/travis_osx_before_install
+++ b/ci/travis_osx_before_install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
+set -x
+
 brew update
diff --git a/ci/travis_osx_install b/ci/travis_osx_install
index e832173733..747c670a94 100755
--- a/ci/travis_osx_install
+++ b/ci/travis_osx_install
@@ -1,20 +1,29 @@
 #!/bin/sh
 
+set -x
+
 brew install gcc@7
 brew outdated gcc@7 || brew upgrade gcc@7
 brew link --overwrite gcc@7
 
+which gcc
+which g++
+which gcc-7
+which g++-7
+
 SRC_DIR=$(pwd)
 PREFIX_DIR=$SRC_DIR/local
-export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7
-export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7
+export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
+export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
 
 wget http://prereleases.llvm.org/5.0.0/rc2/llvm-5.0.0rc2.src.tar.xz 
 wget http://prereleases.llvm.org/5.0.0/rc2/cfe-5.0.0rc2.src.tar.xz
 wget http://prereleases.llvm.org/5.0.0/rc2/lld-5.0.0rc2.src.tar.xz
 
+ls -ahl /usr/local/opt
+
 cd $SRC_DIR
-tar xvf llvm-5.0.0rc2.src.tar.xz
+tar xf llvm-5.0.0rc2.src.tar.xz
 cd llvm-5.0.0rc2.src
 mkdir build
 cd build
@@ -22,7 +31,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
 make install
 
 cd $SRC_DIR
-tar xvf lld-5.0.0rc2.src.tar.xz
+tar xf lld-5.0.0rc2.src.tar.xz
 cd lld-5.0.0rc2.src
 mkdir build
 cd build
@@ -30,7 +39,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
 make install
 
 cd $SRC_DIR
-tar xvf cfe-5.0.0rc2.src.tar.xz
+tar xf cfe-5.0.0rc2.src.tar.xz
 cd cfe-5.0.0rc2.src
 mkdir build
 cd build
diff --git a/ci/travis_osx_script b/ci/travis_osx_script
index 9120e0c766..76c236f8c6 100755
--- a/ci/travis_osx_script
+++ b/ci/travis_osx_script
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+set -x
+
 PREFIX_DIR=$(pwd)/local
-export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7
-export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7
+export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
+export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
 
 echo $PATH
 mkdir build