diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 517bfb9c..b5133480 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -619,6 +619,12 @@ function(add_tests module_files)
         elseif(${LDC_LLVM_VER} LESS 303 AND
             "${testroot}" STREQUAL "phobos_std_range")
             testcase(release "-O1;-release")
+        # Building the rt.util.container tests triggers a bug in the
+        # jump threading pass on every LLVM release before 3.4.
+        # See PR17621.
+        elseif(${LDC_LLVM_VER} LESS 304 AND
+            "${testroot}" STREQUAL "druntime_src_rt_util_container")
+            testcase(release "-O1;-release")
         else()
             testcase(release "-O3;-release")
         endif()
diff --git a/tests/d2/dmd-testsuite b/tests/d2/dmd-testsuite
index 59842855..51f306f8 160000
--- a/tests/d2/dmd-testsuite
+++ b/tests/d2/dmd-testsuite
@@ -1 +1 @@
-Subproject commit 59842855bcba1c1f914e2a4e2aacfd629966a9f9
+Subproject commit 51f306f8570ab6627016a64b17a9ce67c06ab2ce