diff --git a/.travis.yml b/.travis.yml
index 5d584fa..a8ee1c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,27 @@
 sudo: required
-dist: trusty
+language: cpp
 
+env:
+  - distribution: ubuntu
+    version: 16.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: fedora
+    version: 23
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+  
 before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y git cmake make g++ libclang-3.5-dev liblldb-3.5-dev clang-format-3.5 pkg-config libboost-filesystem-dev libboost-regex-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev
+  - sudo docker pull ${distribution}:${version}
+  - sudo docker build --rm=true --file=ci/${distribution}-${version}.docker --tag=${distribution}-${version}:jucipp ci
 
 script:
-  - git submodule update
-  - mkdir build
-  - cd build
-  - cmake -DCMAKE_CXX_COMPILER=g++ ..
-  - make
\ No newline at end of file
+  - container_id=$(mktemp)
+  - sudo docker run --detach --volume="${PWD}":/home/:rw ${run_opts} ${distribution}-${version}:jucipp "${init}" > "${container_id}"
+  
+  - sudo docker exec "$(cat ${container_id})" /home/ci/${distribution}-${version}.build
+  
+  - sudo docker stop "$(cat ${container_id})"
\ No newline at end of file
diff --git a/ci/fedora-23.build b/ci/fedora-23.build
new file mode 100755
index 0000000..2a171e9
--- /dev/null
+++ b/ci/fedora-23.build
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd /home &&
+mkdir build &&
+cd build &&
+cmake -DCMAKE_CXX_COMPILER=g++ .. &&
+make
\ No newline at end of file
diff --git a/ci/fedora-23.docker b/ci/fedora-23.docker
new file mode 100644
index 0000000..79aa8d6
--- /dev/null
+++ b/ci/fedora-23.docker
@@ -0,0 +1,3 @@
+FROM fedora:23
+
+RUN dnf install -y git cmake make gcc-c++ clang-devel clang lldb-devel boost-devel gtksourceviewmm3-devel gtkmm30-devel aspell-devel aspell-en
\ No newline at end of file
diff --git a/ci/ubuntu-16.04.build b/ci/ubuntu-16.04.build
new file mode 100755
index 0000000..2a171e9
--- /dev/null
+++ b/ci/ubuntu-16.04.build
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd /home &&
+mkdir build &&
+cd build &&
+cmake -DCMAKE_CXX_COMPILER=g++ .. &&
+make
\ No newline at end of file
diff --git a/ci/ubuntu-16.04.docker b/ci/ubuntu-16.04.docker
new file mode 100644
index 0000000..17c9335
--- /dev/null
+++ b/ci/ubuntu-16.04.docker
@@ -0,0 +1,4 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y git cmake make g++ libclang-3.5-dev liblldb-3.5-dev clang-format-3.5 pkg-config libboost-filesystem-dev libboost-regex-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev
\ No newline at end of file