diff --git a/.travis.yml b/.travis.yml
index cc43bc0..a3eb5d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,9 @@
 language: ruby
 
 env:
-  #- DOCKERFILE=dockerfiles/Ubuntu15_pybombs.docker IMGNAME=ubu15_pybombs-grgsm
-  - DOCKERFILE=dockerfiles/DebianJessie.docker IMGNAME=debjess-grgsm
-  # - DOCKERFILE=dockerfiles/Ubuntu14.docker IMGNAME=ubu14-grgsm
-  - DOCKERFILE=dockerfiles/Ubuntu15.docker IMGNAME=ubu15-grgsm
-  # - DOCKERFILE=dockerfiles/Kali.docker IMGNAME=kali-grgsm
-  - DOCKERFILE=dockerfiles/Ubuntu16.docker IMGNAME=ubu16-grgsm
+  #- DOCKERFILE=tests/dockerfiles/DebianJessie.docker IMGNAME=debjess-grgsm
+  #- DOCKERFILE=tests/dockerfiles/Ubuntu_15_04.docker IMGNAME=ubu15.04-grgsm
+  - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm
 
 services:
   - docker
diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker
new file mode 100644
index 0000000..2340fed
--- /dev/null
+++ b/tests/dockerfiles/Ubuntu_16_04.docker
@@ -0,0 +1,65 @@
+FROM ubuntu:16.04
+MAINTAINER Ash Wilson
+
+# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status
+RUN apt-get update && apt-get install -y uhd-host || \
+     sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status
+
+RUN apt-get install -y \
+    git \
+    python \
+    python-scipy \
+    cmake \
+    make \
+    autoconf \
+    automake \
+    cpp-4.9 \
+    gcc \
+    g++ \
+    libstdc++-4.9-dev \
+    libcppunit-dev \
+    swig \
+    doxygen \
+    liblog4cpp5v5 \
+    liblog4cpp5-dev \
+    build-essential \
+    libtool \
+    shtool \
+    pkg-config \
+    libpcsclite-dev \
+    gnuradio \
+    gnuradio-dev \
+    gr-osmosdr \
+    libfftw3-dev \
+    libusb-1.0-0-dev \
+    libvolk1-dev \
+    libvolk1.1 \
+    libboost-all-dev \
+    libgnuradio-osmosdr0.1.4 \
+    libmirisdr0 \
+    libosmosdr-dev \
+    libosmosdr0 \
+    librtlsdr-dev \
+    librtlsdr0 \
+    osmo-sdr \
+    rtl-sdr \
+    wget \
+    python-talloc-dev \
+    libtalloc2 \
+    libtalloc-dev \
+    unzip \
+    libosmocore-dev
+
+COPY ./ /src/
+
+RUN mkdir /root/.gnuradio/
+RUN echo "[grc]\nlocal_blocks_path=/usr/local/share/gnuradio/grc/blocks" > \
+    /root/.gnuradio/config.conf
+
+RUN mkdir /src/build && \
+    cd /src/build && \
+    cmake .. && \
+    make && \
+    # make test && \
+    make install && \
+    ldconfig