diff --git a/Dockerfile b/Dockerfile
index 16abce0406689c4e8ef9d98392ad8c251589053d..9386126b8ccd470e6c419783d92f71497860efa8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,4 +36,3 @@ RUN chown -R $UNAME:$GNAME /home/$UNAME
 USER $UNAME
 
 WORKDIR /home/$UNAME/finn
-ENTRYPOINT /bin/bash
diff --git a/run-docker.sh b/run-docker.sh
index a5241ea0ccef6659fdb39a46a9f504d5c783622a..e36fa69fc4e40d1b52f6acbd2a8aedb33ff4b4be 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -z "$VIVADO_PATH" ];then
 	echo "For correct implementation please set an environment variable VIVADO_PATH that contains the path to your vivado installation directory"
@@ -41,6 +41,17 @@ echo "Mounting $SCRIPTPATH/cnpy into /workspace/cnpy"
 echo "Mounting $SCRIPTPATH/finn-hlslib into /workspace/finn-hlslib"
 echo "Mounting $VIVADO_PATH/include into /workspace/vivado-hlslib"
 
+if [ "$1" = "test" ]; then
+	echo "Running test suite"
+	DOCKER_CMD="python setup.py test"
+elif [ "$1" = "notebook" ]; then
+	echo "Running Jupyter notebook server"
+	DOCKER_CMD="jupyter notebook --ip=0.0.0.0 notebooks"
+else
+	echo "Running container only"
+	DOCKER_CMD="bash"
+fi
+
 # Build the FINN Docker image
 docker build --tag=$DOCKER_TAG \
              --build-arg GID=$DOCKER_GID \
@@ -58,4 +69,4 @@ docker run --rm --name finn_dev -it \
 -v $SCRIPTPATH/finn-hlslib:/workspace/finn-hlslib \
 -v $VIVADO_PATH/include:/workspace/vivado-hlslib \
 -p 8888:8888 \
-$DOCKER_TAG bash
+$DOCKER_TAG $DOCKER_CMD