diff --git a/stack/lab/Dockerfile b/stack/lab/Dockerfile
index faccacab..919061a7 100644
--- a/stack/lab/Dockerfile
+++ b/stack/lab/Dockerfile
@@ -21,6 +21,9 @@ RUN mamba install --yes \
      fix-permissions "${CONDA_DIR}" && \
      fix-permissions "/home/${NB_USER}"
 
+# TO-BE-REMOVED: TEST FEATURE BRANCH
+RUN pip install --no-user aiidalab@git+https://github.com/danielhollas/aiidalab@pip-uninstall
+
 # Pin aiidalab version.
 RUN echo "aiidalab==${AIIDALAB_VERSION}" >> /opt/requirements.txt
 RUN conda config --system --add pinned_packages "aiidalab=${AIIDALAB_VERSION}"
diff --git a/tests/test_aiidalab_apps.py b/tests/test_aiidalab_apps.py
index 1b20258d..d97ab886 100644
--- a/tests/test_aiidalab_apps.py
+++ b/tests/test_aiidalab_apps.py
@@ -1,3 +1,5 @@
+import json
+
 import pytest
 
 pytestmark = pytest.mark.integration
@@ -35,11 +37,14 @@ def _generate_aiidalab_install_output(package_name):
     if pkg:
         app_name = pkg.split("@")[0]
         aiidalab_exec(f"aiidalab uninstall --yes --force {app_name}", user=nb_user)
-        # TODO: Remove this after solving https://github.com/aiidalab/aiidalab/issues/405
         pkg_name = app_name
         if app_name.lower() == "quantum-espresso":
             pkg_name = "aiidalab-qe"
-        aiidalab_exec(f"pip uninstall --yes {pkg_name}", user=nb_user)
+        else:
+            pkg_name = app_name
+        cmd = f"mamba list --json --full-name {pkg_name}"
+        pkg_info = json.loads(aiidalab_exec(cmd))
+        assert len(pkg_info) == 0, f"Python package {pkg_name} was not uninstalled"
 
 
 @pytest.mark.parametrize("package_name", ["aiidalab-widgets-base", "quantum-espresso"])