diff --git a/Dockerfile b/Dockerfile
index bf22a141ea0f..d14176fac810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,3 @@ RUN pip install jupyter
 
 COPY . ./
 RUN pip install .
-
-RUN pytest
diff --git a/docker-compose.yml b/docker-compose.yml
index 894afa286529..348c74c19aff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,4 +18,18 @@ services:
       POSTGRES_PASSWORD: test
       POSTGRES_DB: test
     ports:
-      - "5432:5432"
\ No newline at end of file
+      - "5432:5432"
+
+  watchdog:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - type: bind
+        source: .
+        target: /home/jovyan/work/great_expectations
+    links:
+      - postgres:postgres
+    depends_on:
+      - postgres
+    command: watchmedo shell-command --patterns="*.py;*.txt;*.json" --recursive --command='pytest' .
diff --git a/requirements.txt b/requirements.txt
index d76ce191636f..3bd100ab514f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,4 +8,5 @@ argh>=0.26.2
 jsonschema>=2.5.1
 SQLAlchemy>=1.1.13
 psycopg2>=2.7.3.2
-pytest==3.2.5
\ No newline at end of file
+pytest==3.2.5
+watchdog==0.8.3
\ No newline at end of file