diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 48175a72..46b2e799 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,4 +1,5 @@
 steps:
   - label: ":python:"
     commands:
+      # - make
       - ./run-tests.sh
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4bab57e2..ccf35a6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,7 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 # -- Install Pipenv:
-RUN apt-get update \
-  && apt-get install software-properties-common python-software-properties -y \
-  && add-apt-repository ppa:pypa/ppa -y \
-  && apt-get update \
-  && apt-get install git pipenv -y
+RUN apt update && apt install python3-pip -y && pip3 install pipenv
 
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..51b267c5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+test:
+	docker-compose up
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..1fede25a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '3'
+services:
+  pipenv-tests:
+    image: kennethreitz/pipenv-tests
+    command: bash /pipenv/run-tests.sh
+    volumes:
+      - .:/pipenv