diff --git a/.travis.yml b/.travis.yml
index 5079bff0c..b68a94223 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,54 @@
-sudo: false
-dist: trusty
 language: c
-compiler:
-  - gcc
-env:
-  - CMPLR=gcc
-  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=gcc STATIC=YES
-  - CMPLR=clang
-  - CMPLR=clang STATIC=YES
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
+
+matrix:
+  include:
+    - sudo: false
+      dist: bionic
+      compiler: gcc
+      env: CMPLR=gcc
+    - sudo: false
+      dist: xenial
+      compiler: gcc
+      env: CMPLR=gcc
+    - sudo: false
+      dist: bionic
+      compiler: gcc
+      env: CMPLR=gcc CMD_CXXFLAGS=-std=c++11
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: CMPLR=gcc STATIC=YES
+    - sudo: false
+      dist: bionic
+      compiler: gcc
+      env: CMPLR=clang
+    - sudo: false
+      dist: xenial
+      compiler: gcc
+      env: CMPLR=clang
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: CMPLR=clang STATIC=YES
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: WINE=32 TEST=NO STATIC=YES
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: WINE=32 TEST=NO STATIC=NO
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: RTEMS=4.10 TEST=NO
+    - sudo: false
+      dist: trusty
+      compiler: gcc
+      env: RTEMS=4.9 TEST=NO
+    - os: osx
+      env: CMD_CFLAGS="-mmacosx-version-min=10.7" CMD_CXXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++" CMD_LDXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++"
+
 addons:
   apt:
     packages:
@@ -21,12 +57,6 @@ addons:
     - perl
     - clang
     - g++-mingw-w64-i686
-    - bison
-    - flex
-    - texinfo
-    - install-info
-cache:
-  directories:
-   - $HOME/.cache
+
 install: sh ci/travis-prepare.sh </dev/null
 script: sh ci/travis-build.sh </dev/null
diff --git a/ci/travis-build.sh b/ci/travis-build.sh
index 2ee5d652f..e69616aa3 100644
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -75,13 +75,11 @@ CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
 EOF
 
   # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
   echo -n "Using QEMU: "
   type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
 fi
 
-make -j2 $EXTRA
+make -j2 RTEMS_QEMU_FIXUPS=YES CMD_CFLAGS="${CMD_CFLAGS}" CMD_CXXFLAGS="${CMD_CXXFLAGS}" CMD_LDFLAGS="${CMD_LDFLAGS}"
 
 if [ "$TEST" != "NO" ]
 then
diff --git a/ci/travis-prepare.sh b/ci/travis-prepare.sh
index fd8c6fb4b..9797b0faa 100644
--- a/ci/travis-prepare.sh
+++ b/ci/travis-prepare.sh
@@ -6,35 +6,10 @@ die() {
   exit 1
 }
 
-CURDIR="$PWD"
 
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
+if [ -f /etc/hosts ]
 then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
+    echo "==== /etc/hosts"
+    cat /etc/hosts
+    echo "===="
 fi
-
-cd "$CURDIR"