diff --git a/.travis.yml b/.travis.yml
index cf2e565d..6f947305 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,13 @@
 # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: required
-dist: trusty
+dist: xenial
+sudo: true
 
 language: python
 python:
-  - "2.7"
-  - "pypy"
-  - "3.4"
-  - "3.5"
+  - "3.7"
   - "3.6"
+  - "2.7"
+  - "pypy3.5"
 
 install:
   - pip install .
@@ -18,8 +17,22 @@ env:
   - CI_TARGET=iverilog
   - CI_TARGET=ghdl
 
+# Remove when py37 bugs are fixed
+matrix:
+  allow_failures:
+    - python: "3.7"
+    - python: "pypy3.5"
+
+
 before_script:
-  - ./scripts/ci_deps.sh
+  - if [[ "$CI_TARGET" == "iverilog" ]]; then
+      sudo apt-get -qq update;
+      sudo apt-get install iverilog;
+    elif [[ "$CI_TARGET" == "ghdl" ]]; then
+      sudo add-apt-repository ppa:mati75/ghdl -y;
+      sudo apt-get -qq update;
+      sudo apt-get install ghdl;
+    fi
 
 script: ./scripts/ci.sh
 
diff --git a/scripts/ci_deps.sh b/scripts/ci_deps.sh
deleted file mode 100755
index 94c7f236..00000000
--- a/scripts/ci_deps.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ "$CI_TARGET" == "iverilog" ]; then
-  sudo apt-get -qq update
-  sudo apt-get install iverilog
-elif [ "$CI_TARGET" == "ghdl" ]; then
-  url=$(curl -s https://api.github.com/repos/ghdl/ghdl/releases/tags/v0.33 | jq -r ".assets[] | select (.name | test (\"ubuntu1_amd64\"))| .browser_download_url")
-  curl -Lo ghdl.deb $url
-  sudo dpkg -i ghdl.deb
-  sudo apt-get install -f
-fi