diff --git a/.github/workflows/openvidu-ce-test.yml b/.github/workflows/openvidu-ce-test.yml
index 1ef2a0b9..9ba1821e 100644
--- a/.github/workflows/openvidu-ce-test.yml
+++ b/.github/workflows/openvidu-ce-test.yml
@@ -76,8 +76,8 @@ jobs:
         run: /opt/commons.sh --clean-environment
       - name: Prepare test environment
         run: |
-          DOCKER_IMAGE=$(sed -r "s|^(.+):.+$|\1|g" <<<${TEST_IMAGE})
-          /opt/commons.sh --prepare-test-environment ${DOCKER_IMAGE}
+          TEST_IMAGE_WITHOUT_TAG=$(sed -r "s|^(.+):.+$|\1|g" <<<${TEST_IMAGE})
+          /opt/commons.sh --prepare-test-environment "${TEST_IMAGE_WITHOUT_TAG}"
       - name: Setting up Kurento Snapshots
         run: /opt/commons.sh --prepare-kurento-snapshot
       - name: Build openvidu-browser
diff --git a/ci-scripts/commons.sh b/ci-scripts/commons.sh
index fa44e6b1..c655a709 100755
--- a/ci-scripts/commons.sh
+++ b/ci-scripts/commons.sh
@@ -54,10 +54,12 @@ if [[ -n ${1:-} ]]; then
         ;;
 
     --prepare-test-environment)
-        PREPARE_TEST_ENVIRONMENT=true
-        if [[ -n "${2:-}" ]]; then
+        if [[ -z "${2:-}" ]]; then
+            echo "No test docker container provided when running --prepare-test-environment"
+        else
             TEST_IMAGE="${2}"
         fi
+        PREPARE_TEST_ENVIRONMENT=true
         ;;
 
     --prepare-kurento-snapshot)