diff --git a/.travis.yml b/.travis.yml
index 9e2af70c6..7cec6968b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ matrix:
 
   include:
   - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.10 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.10';
+    env: COMPILER=gcc-6 LINUX=ubuntu-16.10 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
       travis/install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.10';
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
       timeout 2400 travis/postsubmit.sh DebugPlain
 #  - compiler: gcc
 #    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain
diff --git a/travis/install_linux.sh b/travis/install_linux.sh
old mode 100644
new mode 100755
diff --git a/travis/postsubmit.sh b/travis/postsubmit.sh
index 0b3893ce9..f875ce86f 100755
--- a/travis/postsubmit.sh
+++ b/travis/postsubmit.sh
@@ -12,34 +12,34 @@ fi
 
 case $OS in
 linux)
-    echo "Linux currently unsupported"
-    exit 2
-#    docker rm -f fruit &>/dev/null || true
-#    docker run -d -it --name fruit --privileged polettimarco/fruit-basesystem:ubuntu-$UBUNTU
-#    docker exec fruit mkdir fruit
-#    docker cp . fruit:/fruit
-#
-#    docker exec fruit bash -c "
-#        export COMPILER=$COMPILER;
-#        export N_JOBS=$N_JOBS;
-#        export STLARG=$STLARG;
-#        export ASAN_OPTIONS=$ASAN_OPTIONS;
-#        export OS=$OS;
-#        cd fruit; travis/postsubmit-helper.sh $1"
-#    exit $?
+    # Execute docker image on linux
+    docker rm -f storm &>/dev/null || true
+    docker run -d -it --name storm --privileged mvolk/storm-basesystem:$LINUX
+    docker exec storm mkdir storm
+    docker cp . storm:/storm
+
+    docker exec storm bash -c "
+        export COMPILER=$COMPILER;
+        export N_JOBS=$N_JOBS;
+        export STLARG=$STLARG;
+        export OS=$OS;
+        cd storm;
+        travis/postsubmit-helper.sh $1"
+    exit $?
     ;;
 
 osx)
+    # Mac OSX
     export COMPILER
     export N_JOBS
     export STLARG
-    export ASAN_OPTIONS
     export OS
-    travis/postsubmit-helper.sh "$@"
+    travis/postsubmit-helper.sh "$1"
     exit $?
     ;;
 
 *)
+    # Other OS
     echo "Unsupported OS: $OS"
     exit 1
 esac