diff --git a/BUILD.bazel b/BUILD.bazel
index 5e9bee1..5a14580 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4,33 +4,34 @@
 
 load(
     "@fuchsia_infra//infra:infra.bzl",
+    "FUCHSIA_TEST_TARGET",
     "fuchsia_builder_group",
     "fuchsia_test_group",
-    "fuchsia_tests",
 )
 
-common_test_deps = [
+qemu_common_tests = [
 ]
 
 fuchsia_test_group(
-    name = "target_tests",
+    name = "tests_qemu",
     product_bundle = "core.x64",
-    deps = common_test_deps,
+    test_target = FUCHSIA_TEST_TARGET.QEMU,
+    deps = qemu_common_tests,
 )
 
 fuchsia_test_group(
-    name = "target_tests_asan",
+    name = "tests_qemu_asan",
     asan_enabled = True,
     product_bundle = "core.x64",
-    deps = common_test_deps,
+    test_target = FUCHSIA_TEST_TARGET.QEMU,
+    deps = qemu_common_tests,
 )
 
-fuchsia_tests(
-    name = "tests",
-    deps = [
-        ":target_tests",
-        ":target_tests_asan",
-    ],
+fuchsia_test_group(
+    name = "tests_vim3",
+    product_bundle = "core.vim3",
+    test_target = FUCHSIA_TEST_TARGET.VIM3,
+    deps = [],
 )
 
 # buildifier: leave-alone
@@ -39,7 +40,9 @@
     build_only = [
     ],
     test_groups = [
-        ":tests",
+        ":tests_qemu",
+        ":tests_qemu_asan",
+        ":tests_vim3",
     ],
     cipd_uploads = [
     ],
diff --git a/manifests/bazel_sdk.ensure b/manifests/bazel_sdk.ensure
index 8eb89bc..d0db033 100644
--- a/manifests/bazel_sdk.ensure
+++ b/manifests/bazel_sdk.ensure
@@ -1,4 +1,4 @@
 $ResolvedVersions bazel_sdk.resolved
 $VerifiedPlatform linux-amd64 mac-amd64
-fuchsia/sdk/core/fuchsia-bazel-rules/${os=linux}-${arch} version:17.20240102.2.1
-fuchsia/sdk/core/fuchsia-bazel-rules/${os=mac}-amd64 version:17.20240102.2.1
+fuchsia/sdk/core/fuchsia-bazel-rules/${os=linux}-${arch} version:18.20240202.2.1
+fuchsia/sdk/core/fuchsia-bazel-rules/${os=mac}-amd64 version:18.20240202.2.1
diff --git a/manifests/bazel_sdk.resolved b/manifests/bazel_sdk.resolved
index ed5c2da..288bae5 100644
--- a/manifests/bazel_sdk.resolved
+++ b/manifests/bazel_sdk.resolved
@@ -2,9 +2,9 @@
 # Do not modify manually. All changes will be overwritten.
 
 fuchsia/sdk/core/fuchsia-bazel-rules/linux-amd64
-	version:17.20240102.2.1
-	GfmWB29BKhKDbfepo1VLNvRE8yZPzK7hrDpA7o0VU3gC
+	version:18.20240202.2.1
+	6lc3Q7L7sWNttaImd_2zCz8QrQ6ZqyOslFj0Mpee2kQC
 
 fuchsia/sdk/core/fuchsia-bazel-rules/mac-amd64
-	version:17.20240102.2.1
-	lnHTCn8DwoL7iBY2YKcnWHAhIOpP_TXK_mgFc0RHhD8C
+	version:18.20240202.2.1
+	3sOllN-UOltAfUAvtYspiSJaPwEcTiaivyAaNh9txiIC
diff --git a/third_party/fuchsia-infra-bazel-rules b/third_party/fuchsia-infra-bazel-rules
index d2a04e2..6aa473f 160000
--- a/third_party/fuchsia-infra-bazel-rules
+++ b/third_party/fuchsia-infra-bazel-rules
@@ -1 +1 @@
-Subproject commit d2a04e20e4ad6ece319720bf2f9016227c7a36fe
+Subproject commit 6aa473f126278c0212753a9308b7ac35caeb9c22