diff --git a/.travis-ci.sh b/.travis-ci.sh
index 3c4fbe3e..1c8d2957 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -17,19 +17,28 @@ case "$TARGET" in
       ./configure -prefix ~/ocaml
       make world.opt
       make install
-      cd ..
+      cd ../..
       rm -rf src
       echo "$OCAML_VERSION.$OCAML_RELEASE" > ~/ocaml/cached-version
     fi
     echo -en "travis_fold:end:ocaml\r"
     if [ $WITH_OPAM -eq 1 ] ; then
       echo -en "travis_fold:start:opam.init\r"
-      sudo add-apt-repository --yes ppa:avsm/ocaml42+opam12
-      sudo apt-get update -qq
-      sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install opam
-      if [ ! -e ~/.opam/lock -o "$OPAM_RESET" = "1" ] ; then
+      if [ ! -e ~/ocaml/bin/opam -o ! -e ~/.opam/lock -o "$OPAM_RESET" = "1" ] ; then
+        mkdir ~/ocaml/src
+        cd ~/ocaml/src
+        wget https://github.com/ocaml/opam/releases/download/1.2.2/opam-full-1.2.2.tar.gz
+        tar -xzf opam-full-1.2.2.tar.gz
+        cd opam-full-1.2.2
+        ./configure --prefix=/home/travis/ocaml
+        make lib-ext
+        make all
+        make install
+        cd ../..
+        rm -rf src
         rm -rf ~/.opam
         opam init --yes
+        eval $(opam config env)
         opam install menhir ocaml-migrate-parsetree js_of_ocaml-ppx --yes
         opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes
       fi
diff --git a/.travis.yml b/.travis.yml
index 1fc6b207..1a5d1f60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,4 +38,7 @@ matrix:
   - os: linux
     env: OCAML_VERSION=4.05 OCAML_RELEASE=0 WITH_OPAM=1
     stage: Test
-    sudo: required
+    addons:
+      apt:
+        packages:
+        - aspcud