diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index fa62c72103..ec604c9476 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -50,6 +50,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
                   --env-file /tmp/env \
                   --name $CONTAINER_NAME \
                   $CI_IMAGE_NAME_TAG)
+  export CI_CONTAINER_ID
 
   # Create a non-root user inside the container which matches the local user.
   #
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index ac2df5fbfb..02c91cfa69 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -82,3 +82,8 @@ fi
 if [ "$RUN_FUZZ_TESTS" = "true" ]; then
   CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
 fi
+
+if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
+  echo "Stop and remove CI container by ID"
+  docker container kill "${CI_CONTAINER_ID}"
+fi