diff --git a/install.sh b/install.sh
index 9dcc867..b8ef1c2 100644
--- a/install.sh
+++ b/install.sh
@@ -26,6 +26,13 @@ check_packages() {
 
 check_packages lsb-release wget gnupg
 
+# llvm.sh requires software-properties-common in distro-versions where it is still available
+apt_get_update_if_needed
+SPCCHECK=$(apt-cache search software-properties-common)
+if [ ! -z "$SPCCHECK" ]; then
+  apt-get -y install --no-install-recommends software-properties-common
+fi
+
 # Remove any previous LLVM that may be in the base image
 # LLVM packages packaged by Ubuntu may get picked over us and
 # cause problems later.
@@ -40,7 +47,7 @@ if [ ! -f "/etc/apt/sources.list" ]; then
 fi
 
 cd /tmp
-wget https://apt.llvm.org/llvm.sh
+wget --no-check-certificate https://apt.llvm.org/llvm.sh
 chmod +x llvm.sh
 ./llvm.sh $VERSION all
 rm llvm.sh
diff --git a/test.sh b/test.sh
index 421398b..53cd33b 100755
--- a/test.sh
+++ b/test.sh
@@ -17,6 +17,6 @@ cat <<EOF | tee .devcontainer/devcontainer.json
 EOF
 rsync -av --exclude .git "$feature_dir/" "$PWD/.devcontainer/feature/"
 tree -a
-container_id=$(devcontainer up --workspace-folder . | jq -r .containerId)
+container_id=$(devcontainer up --workspace-folder . | grep outcome | jq -r .containerId)
 devcontainer exec --workspace-folder . clang --version
 docker kill "$container_id"