diff --git a/.devcontainer/cpp/Dockerfile b/.devcontainer/cpp/Dockerfile
index 75f6187e..9f4dce7f 100644
--- a/.devcontainer/cpp/Dockerfile
+++ b/.devcontainer/cpp/Dockerfile
@@ -114,6 +114,7 @@ RUN --mount=type=cache,target=/var/log,sharing=locked \
                         --slave /usr/bin/mull-reporter mull-reporter /usr/bin/mull-reporter-${CLANG_VERSION} \
                         --slave /usr/lib/mull-ir-frontend mull-ir-frontend /usr/lib/mull-ir-frontend-${CLANG_VERSION} \
  && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
+ && mkdir /root/.amp \
  && cp /etc/skel/.bashrc /root/.bashrc
 
 # Set up package managers CPM and Conan
diff --git a/test/cpp/integration-tests.bats b/test/cpp/integration-tests.bats
index a2fded6f..c2046f9b 100644
--- a/test/cpp/integration-tests.bats
+++ b/test/cpp/integration-tests.bats
@@ -178,6 +178,11 @@ teardown() {
   assert_output --partial "All checks completed, 0 errors"
 }
 
+@test "clangd should start with a specified compile commands path" {
+  run timeout 1s clangd --compile-commands-dir=/root/.amp
+  refute_output --partial "Path specified by --compile-commands-dir does not exist. The argument will be ignored."
+}
+
 @test "using lld as an alternative linker should result in working host executable" {
   cmake --preset gcc
   cmake --build --preset gcc-lld