diff --git a/.travis.yml b/.travis.yml
index 451bca03..795d13de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,30 +97,6 @@ env:
   - S1=PHP V1=7.2 S2=PGSQL V2=10.0
 
 
-###
-### Build Matrix definition
-###
-#matrix:
-#  allow_failures:
-#    - env: S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.2
-#
-
-###
-### Berfore Install
-###
-before_install:
-  # Get newer docker version
-  - max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
-  - max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce; then break; else i=$((i+1)); fi done
-  # Get newer docker-compose version
-  - max=100; i=0; while [ $i -lt $max ]; do if curl -L --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose; then break; else i=$((i+1)); fi done
-  - chmod +x docker-compose
-  - sudo mv -f docker-compose /usr/local/bin
-  # List versions
-  - docker version
-  - docker-compose version
-
-
 ###
 ### Installation
 ###
@@ -133,6 +109,27 @@ install:
       pip install sphinx_rtd_theme;
     fi
 
+  # Install dependencies for docker/docker-compose
+  - if [ "${S1}" != "DOCUMENTATION" ]; then
+      max=100; i=0;
+      while [ $i -lt $max ]; do
+        if sudo apt-get update; then break; else i=$((i+1)); fi
+      done;
+
+      max=100; i=0;
+      while [ $i -lt $max ]; do
+        if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce; then break; else i=$((i+1)); fi
+      done;
+
+      max=100; i=0;
+      while [ $i -lt $max ]; do
+        if curl -L --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose; then break; else i=$((i+1)); fi
+      done;
+
+      chmod +x docker-compose;
+      sudo mv -f docker-compose /usr/local/bin;
+    fi
+
 
 ###
 ### Before Script
@@ -153,6 +150,19 @@ before_script:
   - sudo service mongodb    stop || true
   - netstat -tulpn
 
+  # Show Python/pip
+  - if [ "${S1}" = "DOCUMENTATION" ]; then
+      pip freeze;
+      pip --version;
+      python --version;
+    fi
+
+  # Show Docker/Docker Compose
+  - if [ "${S1}" != "DOCUMENTATION" ]; then
+      docker --version;
+      docker-compose --version;
+    fi
+
 
 ###
 ### Test