diff --git a/.travis.yml b/.travis.yml
index 634faf78..c4ffaabe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,9 @@
-language: cpp
-dist: xenial
-
-compiler:
-  - gcc
-  - clang
-os:
-  - linux
-  - osx
-
+language: bash
 matrix:
-  exclude:
-    # GCC fails on recent Travis OSX images.
-    - compiler: gcc
-      os: osx
-
-script: python test/run.py
+  include:
+    - os: windows
+      env:
+        - CMAKE_PATH="/c/Program Files/CMake/bin"
+      script: 
+        - export PATH=$CMAKE_PATH:$PATH
+        - python test/run.py
diff --git a/docker/Dockerfile.ubuntu_xenial b/docker/Dockerfile.ubuntu_xenial
index e24fe498..1e87694d 100644
--- a/docker/Dockerfile.ubuntu_xenial
+++ b/docker/Dockerfile.ubuntu_xenial
@@ -1,24 +1,22 @@
-# Build time
-FROM ubuntu:xenial as build
+FROM fedora:30 as build
 
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update 
-RUN apt-get -y install wget 
+RUN yum install -y gcc-g++
+RUN yum install -y cmake
+RUN yum install -y make
+RUN yum install -y openssl-devel
+
+RUN yum install -y wget
 RUN mkdir -p /tmp/cmake
 WORKDIR /tmp/cmake
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
 RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
 
-RUN apt-get -y install g++ 
-RUN apt-get -y install libssl-dev
-RUN apt-get -y install libz-dev
-RUN apt-get -y install make
-RUN apt-get -y install python
-
-COPY . .
-
 ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
 ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
 
-# RUN ["make"]
+RUN yum install -y python
+RUN yum install -y libtsan
+
+COPY . .
 RUN ["make", "test"]
+# RUN ["make"]