diff --git a/.travis.yml b/.travis.yml
index 1d992c3..3388ee4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,31 @@
-dist: trusty
+dist: xenial
 sudo: false
 
 language: d
 os:
  - linux
- #- osx
 d:
  - dmd
- # - dmd-nightly
  - ldc
- # - ldc-beta
  
 branches:
   only:
   - master
 
 before_install:
-  - pyenv install 3.6.3
-  - pyenv global system 3.6.3
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi
+  - sudo apt-get install python3-pip python3-setuptools
   - pip3 install 'meson==0.48.2'
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir .ntmp && curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip .ntmp/ninja-linux.zip -d .ntmp; fi
+  - mkdir .ntmp && curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip
+  - unzip .ntmp/ninja-linux.zip -d .ntmp
 
 before_script:
   - export PATH=$PATH:$PWD/.ntmp
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then meson build && ninja -j8 -C build; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ninja -j8 -C build test -v; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -j8 -C build test; fi
+  - meson build && ninja -j8 -C build
+  - ninja -j8 -C build test -v
   - dub build
   - "dub build dyaml:benchmark"
   - "dub build dyaml:constructor"