diff --git a/.travis.yml b/.travis.yml
index 318cfff21..014d8c940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
     
     - name: "klayout python2 osx10.12"
       os: osx
@@ -20,7 +19,6 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
     
     - name: "klayout python2 osx10.11"
       os: osx
@@ -30,19 +28,22 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
 
     # python 3 osx
     
     - name: "klayout python3 osx10.13"
       os: osx
       osx_image: xcode9.4  # macOS 10.13
+      addons:
+        homebrew:
+          packages:
+            - python3
+          update: true
       env:
         - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=true
 
     - name: "klayout python3.6.6 osx10.13"
       os: osx
@@ -52,7 +53,6 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
 
     - name: "klayout python3.5.6 osx10.13"
       os: osx
@@ -62,7 +62,6 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
 
     - name: "klayout python3.4.9 osx10.13"
       os: osx
@@ -72,17 +71,20 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
     
     - name: "klayout python3 osx10.12"
       os: osx
       osx_image: xcode8.3  # macOS 10.12
+      addons:
+        homebrew:
+          packages:
+            - python3
+          update: true
       env:
         - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=true
     
     - name: "klayout python3 osx10.11"
       os: osx
@@ -92,7 +94,6 @@ matrix:
         - ARCHFLAGS="-std=c++11"
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
     
     - name: "klayout python3.7 package"
       os: linux
@@ -104,7 +105,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
 
@@ -118,7 +118,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
     
@@ -132,7 +131,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
     
@@ -146,7 +144,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="0"  # setuptools installed from last pip has syntax error on py 2.6
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
     
@@ -160,7 +157,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
     
@@ -174,7 +170,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
     
@@ -188,7 +183,6 @@ matrix:
         - MATRIX_EVAL=""
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
-        - BREW_BUNDLE=false
         - CC=clang
         - CXX=clang++
 
@@ -197,73 +191,95 @@ matrix:
     - name: "KLayout macOS 10.13 with py3.7"
       os: osx
       osx_image: xcode9.4 # macOS 10.13
+      addons:
+        homebrew:
+          packages:
+            - python3
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=B37
         - MACOS_VERSION=HighSierra
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
     - name: "KLayout macOS 10.12 with py3.7"
       os: osx
       osx_image: xcode8.3 # macOS 10.12
+      addons:
+        homebrew:
+          packages:
+            - python3
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=B37
         - MACOS_VERSION=Sierra
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
     - name: "KLayout macOS 10.11 with py3.7"
       os: osx
       osx_image: xcode8 # macOS 10.11
+      addons:
+        homebrew:
+          packages:
+            - python3
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=B37
         - MACOS_VERSION=ElCapitan
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
     # Python 2
     - name: "KLayout macOS 10.13 with py2.7"
       os: osx
       osx_image: xcode9.4 # macOS 10.13
+      addons:
+        homebrew:
+          packages:
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=Sys
         - MACOS_VERSION=HighSierra
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
     - name: "KLayout macOS 10.12 with py2.7"
       os: osx
       osx_image: xcode8.3 # macOS 10.12
+      addons:
+        homebrew:
+          packages:
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=Sys
         - MACOS_VERSION=Sierra
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
     - name: "KLayout macOS 10.11 with py2.7"
       os: osx
       osx_image: xcode8 # macOS 10.11
+      addons:
+        homebrew:
+          packages:
+            - qt
+          update: true
       env:
         - MATRIX_EVAL=""
         - PYTHON_VERSION=Sys
         - MACOS_VERSION=ElCapitan
         - KLAYOUT_BUILD=true
-        - BREW_BUNDLE=true
 
 before_install:
   - env
   - gem install dropbox-deployment
   - eval "${MATRIX_EVAL}"
-  - if [ "$BREW_BUNDLE" = true ]; then
-        find "$(brew --prefix)/Caskroom/"*'/.metadata' -type f -name '*.rb' | xargs grep 'EOS.undent' --files-with-matches | xargs sed -i '' 's/EOS.undent/EOS/';
-        brew update;
-        brew bundle;
-    fi
   - if [ "${PIP_UPDATE}" == "1" ]; then
         pip --version;
         pip install --upgrade pip || sudo pip install --upgrade pip;