diff --git a/.travis.yml b/.travis.yml
index 0db1ba26a..e6873263c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,29 @@
 language:
   cpp
 
+dist: 
+  trusty
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libassimp-dev
+      - libfreetype6-dev
+      - libgl1-mesa-dev
+      - libopenal-dev
+      - libsndfile1-dev
+      - libx11-dev
+      - libxcb-cursor-dev
+      - libxcb-ewmh-dev
+      - libxcb-icccm4-dev
+      - libxcb-keysyms1-dev
+      - libxcb-randr0-dev
+      - mesa-common-dev
+
 sudo:
-  required
+  false
 
 notifications:
   email: true
@@ -10,26 +31,14 @@ notifications:
 env:
   - CONFIG=debug
   - CONFIG=release
-  
-services:
-  - docker
-
-before_install:
-  - docker build -t nazara .
 
 script:
-  - docker run --name Nazara -v `pwd`:/NazaraEngine nazara
-      sh -c "
-        cd build &&
-        ./premake5-linux64 --with-examples gmake &&
-        cd gmake &&
-        make -j4 -f NazaraEngine.make config=${CONFIG}dynamic_x64
-      "
+  - cd build &&
+       ./premake5-linux64 --with-examples gmake &&
+       cd gmake &&
+       make -j4 -f NazaraEngine.make config=${CONFIG}dynamic_x64
 
-#after_script:
-#  - docker exec Nazara
-#      sh -c "
-#        cd ../../tests &&
-#        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../lib/gmake/x64/:../extlibs/lib/gmake/x64/ &&
-#        ./NazaraUnitTests
-#      "
+after_script:
+  - cd ../../tests &&
+       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../lib/gmake/x64/:../extlibs/lib/gmake/x64/ &&
+       ./NazaraUnitTests
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index ac2568e3c..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:xenial
-
-RUN apt-get update && apt-get -y install && \
-	apt-get install -y libssl1.0.0 libssl-dev && \
-	apt-get install -y libopenal-dev libsndfile1-dev && \
-	apt-get install -y libxcb-cursor-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev libx11-dev libfreetype6-dev && \
-	apt-get install -y mesa-common-dev libgl1-mesa-dev && \
-	apt-get install -y libassimp-dev
-
-RUN mkdir /NazaraEngine
-WORKDIR /NazaraEngine