diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0093753215..1595472977 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,11 @@ workflows:
                 command: |
                    DOCKER_TAG=$(docker run quay.io/nushell/nu --version | cut -d' ' -f2)
                    echo "Version that would be used for Docker tag is v${DOCKER_TAG}"
+            - run:
+                name: Test Executable
+                command: |
+                   docker run --rm quay.io/nushell/nu-base --help
+                   docker run --rm quay.io/nushell/nu --help
 
   # workflow publishes to Docker Hub, with each job having different triggers
   build_with_deploy:
@@ -77,6 +82,11 @@ workflows:
                 name: Build Multistage (smaller) container
                 command: |
                   docker build -f docker/Dockerfile -t quay.io/nushell/nu .
+            - run:
+                name: Test Executable
+                command: |
+                   docker run --rm quay.io/nushell/nu --help
+                   docker run --rm quay.io/nushell/nu-base --help
             - run:
                 name: Publish Docker Tag with Nushell Version
                 command: |
@@ -109,6 +119,11 @@ workflows:
                 name: Build Multistage (smaller) container
                 command: |
                   docker build --build-arg FROMTAG=devel -f docker/Dockerfile -t quay.io/nushell/nu:devel .
+            - run:
+                name: Test Executable
+                command: |
+                   docker run --rm quay.io/nushell/nu:devel --help
+                   docker run --rm quay.io/nushell/nu-base:devel --help
             - run:
                 name: Publish Development Docker Tags
                 command: |
@@ -138,6 +153,11 @@ workflows:
                 name: Build Multistage (smaller) container
                 command: |
                   docker build -f docker/Dockerfile -t quay.io/nushell/nu:nightly .
+            - run:
+                name: Test Executable
+                command: |
+                   docker run --rm quay.io/nushell/nu:nightly --help
+                   docker run --rm quay.io/nushell/nu-base:nightly --help
             - run:
                 name: Publish Nightly Nushell Containers
                 command: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c4dafe3306..ffb1e5377d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,9 @@
-ARG  FROMTAG=latest
+ARG FROMTAG=latest
 FROM quay.io/nushell/nu-base:${FROMTAG} as base
-FROM rust:1.37-slim
+FROM ubuntu:18.04
 COPY --from=base /usr/local/bin/nu /usr/local/bin/nu
-RUN apt-get update && \
-    apt-get install -y pkg-config libssl-dev
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y libssl-dev \
+    pkg-config
 ENTRYPOINT ["nu"]
 CMD ["-l", "info"]
diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base
index 08cb0a8920..68b393b420 100644
--- a/docker/Dockerfile.nu-base
+++ b/docker/Dockerfile.nu-base
@@ -6,8 +6,6 @@ FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y libssl-dev \
     libxcb-composite0-dev \
-    libx11-dev \
-    libssl-dev \
     pkg-config \
     curl