diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index d7eab97c286..f2f4f741533 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -13,30 +13,24 @@ VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
 VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
 
-function build_arch {
-  local arch="$1"
-
-  meson setup                              \
-        -Denable_tests=true                \
-        --buildtype release                \
-        --prefix "$VKD3D_PROTON_DST_DIR"   \
-        --strip                            \
-        --bindir "x${arch}"                \
-        --libdir "x${arch}"                \
-        "$VKD3D_PROTON_BUILD_DIR/build.${arch}"
-
-  ninja -C "$VKD3D_PROTON_BUILD_DIR/build.${arch}" install
-
-  install -D -m755 -t "${VKD3D_PROTON_DST_DIR}/x${arch}/bin" "$VKD3D_PROTON_BUILD_DIR/build.${arch}/tests/d3d12"
-}
-
 git clone https://github.com/HansKristian-Work/vkd3d-proton.git --single-branch -b master --no-checkout "$VKD3D_PROTON_SRC_DIR"
 pushd "$VKD3D_PROTON_SRC_DIR"
 git checkout "$VKD3D_PROTON_COMMIT"
 git submodule update --init --recursive
 git submodule update --recursive
-build_arch 64
-build_arch 86
+
+meson setup                              \
+      -D enable_tests=true               \
+      --buildtype release                \
+      --prefix "$VKD3D_PROTON_DST_DIR"   \
+      --strip                            \
+      --libdir "lib"                     \
+      "$VKD3D_PROTON_BUILD_DIR/build"
+
+ninja -C "$VKD3D_PROTON_BUILD_DIR/build" install
+
+install -m755 -t "${VKD3D_PROTON_DST_DIR}/" "$VKD3D_PROTON_BUILD_DIR/build/tests/d3d12"
+
 mkdir "$VKD3D_PROTON_DST_DIR/tests"
 cp \
   "tests/test-runner.sh" \
diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
index 36737e18f6f..028f5dceeac 100755
--- a/.gitlab-ci/vkd3d-runner.sh
+++ b/.gitlab-ci/vkd3d-runner.sh
@@ -21,7 +21,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
 # command.
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/lib/"
 
 
 # Set the Vulkan driver to use.
@@ -90,7 +90,7 @@ printf "%s\n" "Running vkd3d-proton testsuite..."
 
 LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
 TEST_LOGS="$RESULTS_DIR/test-logs"
-(cd /vkd3d-proton-tests && tests/test-runner.sh x64/bin/d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE")
+(cd /vkd3d-proton-tests && tests/test-runner.sh ./d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE")
 
 printf '\n\n'