diff --git a/.dockerignore b/.dockerignore
index 2b9edd38..db06c9f3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,7 +16,7 @@
 !docs
 !ABOUT-NLS
 !config.rpath
-!docker/ci-entrypoint.sh
+!docker/build-and-test.sh
 
 # API
 !python
diff --git a/docker/ci-entrypoint.sh b/docker/build-and-test.sh
similarity index 94%
rename from docker/ci-entrypoint.sh
rename to docker/build-and-test.sh
index 8556f8cb..20689683 100644
--- a/docker/ci-entrypoint.sh
+++ b/docker/build-and-test.sh
@@ -36,5 +36,4 @@ make install
 
 # Run tests
 yellow_echo "Running Tests"
-cd /code/build/src/testsuite/libunderpass.all
 make check -j `nproc`
diff --git a/docker/underpass.dockerfile b/docker/underpass.dockerfile
index 0fd1a747..b1289401 100644
--- a/docker/underpass.dockerfile
+++ b/docker/underpass.dockerfile
@@ -51,9 +51,9 @@ RUN set -ex \
 
 
 FROM deps as ci
-COPY docker/ci-entrypoint.sh /ci-entrypoint.sh
-RUN chmod +x /ci-entrypoint.sh
-ENTRYPOINT [ "/ci-entrypoint.sh" ]
+COPY docker/build-and-test.sh /build-and-test.sh
+RUN chmod +x /build-and-test.sh
+ENTRYPOINT [ "/bin/bash", "-c" ]