diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d9385333..9abf6cd4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,12 +3,5 @@ steps:
     command: docker build --tag diagrams:1.0 -f ./docker/dev/Dockerfile .
 
   - wait
-  - label: 'Run tests'
-    command: docker run --rm diagrams:1.0 python -m unittest tests/*.py -v
-
-  - wait
-  - label: 'Autogen classes'
-    command: docker run --rm diagrams:1.0 ./autogen.sh
-
   - label: 'Build dist image and publish'
     command: docker build --tag diagrams-build:1.0 -f ./docker/dev/Dockerfile2 .
\ No newline at end of file
diff --git a/docker/dev/Dockerfile2 b/docker/dev/Dockerfile2
index a9662592..b3f92c7d 100644
--- a/docker/dev/Dockerfile2
+++ b/docker/dev/Dockerfile2
@@ -6,6 +6,10 @@ RUN pip install --user poetry
 
 WORKDIR /usr/src/diagrams
 
+RUN python -m unittest tests/*.py -v
+
+RUN ./autogen.sh
+
 RUN /root/.local/bin/poetry build
 
 RUN curl -v -u deployment:deployment123\