diff --git a/.travis-dockerfiles/LICENSE b/.travis-dockerfiles/LICENSE
deleted file mode 100644
index 07758b69a..000000000
--- a/.travis-dockerfiles/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2018, Geoffroy Van Cutsem
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/.travis-dockerfiles/README.md b/.travis-dockerfiles/README.md
index 88405db9e..35c38cf85 100644
--- a/.travis-dockerfiles/README.md
+++ b/.travis-dockerfiles/README.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-This repository contains a number of Dockerfile that include
+This folder contains a number of Dockerfile that include
 all the build tools and dependencies to build the ACRN Project
 components, i.e. the `acrn-hypervisor` and `acrn-devicemodel`
 
diff --git a/.travis-dockerfiles/test_all_distros.sh b/.travis-dockerfiles/test_all_distros.sh
deleted file mode 100755
index fd944e4c5..000000000
--- a/.travis-dockerfiles/test_all_distros.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-DOCKER_BIN=`which docker`
-
-function usage {
-    echo "Usage: $0 <path-to-acrn>"
-    echo "  Where <path-to-acrn> is the path to where you"
-    echo "  have cloned the acrn repositories"
-    exit 1
-}
-
-if [ $# -eq 0 ];
-then
-	usage
-fi
-
-build_container () {
-	var=$(sudo $DOCKER_BIN images --format '{{.Tag}}' | grep -c $distro)
-	echo $var
-if [ $(sudo $DOCKER_BIN images --format '{{.Repository}}' | grep -c $distro) ==  '0' ];
-then
-	echo There is no build container for $distro yet.
-	echo Creating a build container for $distro... please be patient!
-	$DOCKER_BIN build -t $distro -f Dockerfile.$distro .
-else
-	echo We already have a build container for $distro, attempting to use it...
-fi
-}
-
-for distro in `ls Dockerfile.*`; do
-	# Extract the name of the Linux distro. It assumes the Dockerfile name is built as "Dockerfile.<distro>"
-	distro=${distro:11}
-	build_container
-	echo "Testing Linux distribion: $distro"
-	$DOCKER_BIN run -v $1:/root/acrn:z $distro make
-done
-
diff --git a/.travis.yml b/.travis.yml
index d3db74eac..f48130229 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ language: c
 
 env:
    global:
-      - OS_TESTED="clearlinux"
+      - OS_TESTED_CL="clearlinux"
+      - OS_TESTED_UBUNTU="ubuntu16.04"
+      - OS_TESTED_FEDORA="fedora26"
 
    matrix:
       - RELEASE=0
@@ -23,10 +25,14 @@ services:
    - docker
 
 before_install:
-   - docker build -t ${OS_TESTED} -f .travis-dockerfiles/Dockerfile.${OS_TESTED} .
+   - docker build -t ${OS_TESTED_CL} -f .travis-dockerfiles/Dockerfile.${OS_TESTED_CL} .
+   - docker build -t ${OS_TESTED_UBUNTU} -f .travis-dockerfiles/Dockerfile.${OS_TESTED_UBUNTU} .
+   - docker build -t ${OS_TESTED_FEDORA} -f .travis-dockerfiles/Dockerfile.${OS_TESTED_FEDORA} .
    - docker images
 
 install: true
 
 script:
-   - docker run -v $PWD:/root/acrn ${OS_TESTED} /bin/bash -c "make clean && make PLATFORM=$PLATFORM RELEASE=$RELEASE"
+   - docker run -v $PWD:/root/acrn ${OS_TESTED_CL} /bin/bash -c "make clean && make PLATFORM=$PLATFORM RELEASE=$RELEASE"
+   - docker run -v $PWD:/root/acrn ${OS_TESTED_UBUNTU} /bin/bash -c "make clean && make PLATFORM=$PLATFORM RELEASE=$RELEASE"
+   - docker run -v $PWD:/root/acrn ${OS_TESTED_FEDORA} /bin/bash -c "make clean && make PLATFORM=$PLATFORM RELEASE=$RELEASE"