diff --git a/Dockerfile b/Dockerfile
index 39f121d9d..6a4710b09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN mkdir /app
 WORKDIR /app
 ADD .git .git
 ADD src src
+ADD test test
 ADD Makefile Makefile
 
 CMD ["make", "build"]
diff --git a/Makefile b/Makefile
index 3fd8f6d8e..2290e4097 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ clean:
 
 docker_build:
 	docker build -t tomb1main .
-	docker run -v $(CWD)/.git:/app/.git -v $(CWD)/build:/app/build tomb1main
+	docker run --rm -v $(CWD)/.git:/app/.git -v $(CWD)/build:/app/build tomb1main
 
 lint:
 	clang-format-10 -i $(C_FILES) $(H_FILES) $(TEST_C_FILES) $(TEST_H_FILES)