diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0344524118dcb12c7b6a7853dd728a2c2f6df5f4..fadbc1a75c3e2f9345094d190e93ecfed6877f02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,28 @@
-image: nedadtu/pungi-ci:latest  # use Neil Davis's pungi image from dockerhub
+# ===== DEFINE DOCKER IMAGE =====
+# 2018.05.03 dockerhub image generated using docker/Dockerfile_simple
+image: rinkdtu/topfarm-ci:latest
+
+
+# ===== TEST TOPFARM =====
+test_topfarm:  # name the job what we like
+  stage:  # build, test, deploy defined by default [2]
+    test
+  script:
+  - cd tests; py.test --cov-report term-missing:skip-covered --cov=topfarm
+  only:  # only run for these branches
+  - master
+  - test_ci
+  tags:  # select which runners can do this job [3]
+  - python
 
 
 # ===== BUILD DOCS AND PUSH TO PUBLIC WEBSITE =====
 pages:  # "pages" is a job specifically for GitLab pages [1]
   stage:  # build, test, deploy defined by default [2]
     deploy
-  script:
-  - cd docs; make html  # use sphinx to build docs
-  - cd ../; mv docs/build/html public/  # move build to public page
+  script:  # use sphinx to build docs, move to public page
+  - cd docs; make html
+  - cd ../; mv docs/build/html public/
   artifacts:  # required for GitLab pages [1]
     paths:
     - public
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..effcdc9187d0553ab7bc557e412e79d29b0f7eb0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+[![pipeline status](https://gitlab.windenergy.dtu.dk/TOPFARM/TopFarm2/badges/master/pipeline.svg)](https://gitlab.windenergy.dtu.dk/TOPFARM/TopFarm2/commits/master)
+[![coverage report](https://gitlab.windenergy.dtu.dk/TOPFARM/TopFarm2/badges/master/coverage.svg)](https://gitlab.windenergy.dtu.dk/TOPFARM/TopFarm2/commits/master)
\ No newline at end of file
diff --git a/docker/Dockerfile_simple b/docker/Dockerfile_simple
new file mode 100644
index 0000000000000000000000000000000000000000..236e2a96551db183c1a91b5d90125445c815d06b
--- /dev/null
+++ b/docker/Dockerfile_simple
@@ -0,0 +1,25 @@
+# ==================================================================
+# Creating a simple docker image for TOPFARM testing and docs
+# ==================================================================
+FROM continuumio/anaconda3:latest
+MAINTAINER Jenni Rinker <rink@dtu.dk>
+
+
+# get list of update linux files and install lib for matplotlib
+#   (anaconda3:5.0.0 image doesn't have the library)
+#    also install "make" because image doesn't have it either
+RUN apt-get update && \
+    apt-get install make && \
+    apt-get install libgl1-mesa-glx -y
+
+
+# use conda to update itself and install packages not in the
+#   anaconda3 image
+RUN conda update -y conda &&\
+    conda install -y sphinx_rtd_theme && \
+    conda install -y pytest-cov && \
+    conda clean -y --all
+
+# update pip then install openmdao (nocache to save space)
+RUN pip install --upgrade pip &&\
+    pip install --no-cache-dir openmdao