diff --git a/buildkite.sh b/buildkite.sh
index 4a0c57d5..85aca4f0 100755
--- a/buildkite.sh
+++ b/buildkite.sh
@@ -118,6 +118,7 @@ projects=(
     "LaurentTreguier/dls" # 1m55s
     "eBay/tsv-utils" # 1m41s
     "dlang-community/D-Scanner" # 1m40s
+    "dlang/druntime" # 1m18s
     "dlang-tour/core" # 1m17s
     "d-widget-toolkit/dwt" # 1m16s
     "rejectedsoftware/diet-ng" # 56s
diff --git a/buildkite/build_project.sh b/buildkite/build_project.sh
index 2a37c1db..326e7d60 100755
--- a/buildkite/build_project.sh
+++ b/buildkite/build_project.sh
@@ -250,6 +250,8 @@ case "$REPO_FULL_NAME" in
         ninja -j2 ldc2 druntime-ldc phobos2-ldc
         ;;
 
+    dlang/dmd | \
+    dlang/druntime | \
     dlang/phobos)
         "$DIR"/clone_repositories.sh
         # To avoid running into "Path too long" issues, see e.g. https://github.com/dlang/ci/pull/287
@@ -257,7 +259,9 @@ case "$REPO_FULL_NAME" in
         export TEMP="$TMP"
         export TMPDIR="$TMP"
         rm -rf "$TMP" && mkdir -p "$TMP"
-        cd phobos && make -f posix.mak -j2 buildkite-test
+        # patch makefile which requires gdb 8 - see https://github.com/dlang/ci/pull/301
+        sed "s/TESTS+=rt_trap_exceptions_drt_gdb//" -i druntime/test/exceptions/Makefile
+        cd "$(basename "${REPO_FULL_NAME}")"&& make -f posix.mak clean && make -f posix.mak -j2 buildkite-test
         rm -rf "$TMP"
         ;;