diff --git a/MODULE.bazel b/MODULE.bazel
index 95d6b9e3a9..b5f67c204e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -246,6 +246,8 @@ use_repo(
     "somepkg_with_build_files",
     "whl_library_extras_direct_dep",
     "whl_with_build_files",
+    "whl_with_data1",
+    "whl_with_data2",
 )
 
 dev_rules_python_config = use_extension(
diff --git a/examples/pip_parse/pip_parse_test.py b/examples/pip_parse/pip_parse_test.py
index 2fdd45477e..c532dff564 100644
--- a/examples/pip_parse/pip_parse_test.py
+++ b/examples/pip_parse/pip_parse_test.py
@@ -52,16 +52,16 @@ def test_data(self):
         self.assertIsNotNone(actual)
         actual = self._remove_leading_dirs(actual.split(" "))
 
-        self.assertListEqual(
-            actual,
-            [
-                "data/share/doc/packages/s3cmd/INSTALL.md",
-                "data/share/doc/packages/s3cmd/LICENSE",
-                "data/share/doc/packages/s3cmd/NEWS",
-                "data/share/doc/packages/s3cmd/README.md",
-                "data/share/man/man1/s3cmd.1",
-            ],
-        )
+        expected = [
+            "bin/s3cmd",
+            "data/share/doc/packages/s3cmd/INSTALL.md",
+            "data/share/doc/packages/s3cmd/LICENSE",
+            "data/share/doc/packages/s3cmd/NEWS",
+            "data/share/doc/packages/s3cmd/README.md",
+            "data/share/man/man1/s3cmd.1",
+        ]
+
+        self.assertListEqual(actual, expected)
 
     def test_dist_info(self):
         actual = os.environ.get("WHEEL_DIST_INFO_CONTENTS")
diff --git a/python/config_settings/BUILD.bazel b/python/config_settings/BUILD.bazel
index 7060d50b26..7f8b6b9734 100644
--- a/python/config_settings/BUILD.bazel
+++ b/python/config_settings/BUILD.bazel
@@ -229,7 +229,7 @@ string_flag(
 )
 
 config_setting(
-    name = "is_venvs_site_packages",
+    name = "_is_venvs_site_packages",
     flag_values = {
         ":venvs_site_packages": VenvsSitePackages.YES,
     },
diff --git a/python/private/internal_dev_deps.bzl b/python/private/internal_dev_deps.bzl
index fbdd5711b1..11b020e59f 100644
--- a/python/private/internal_dev_deps.bzl
+++ b/python/private/internal_dev_deps.bzl
@@ -91,6 +91,28 @@ def _internal_dev_deps_impl(mctx):
         enable_implicit_namespace_pkgs = False,
     )
 
+    whl_from_dir_repo(
+        name = "whl_with_data1_whl",
+        root = "//tests/repos/whl_with_data1:BUILD.bazel",
+        output = "whl_with_data1-1.0-any-none-any.whl",
+    )
+    whl_library(
+        name = "whl_with_data1",
+        whl_file = "@whl_with_data1_whl//:whl_with_data1-1.0-any-none-any.whl",
+        requirement = "whl-with-data1",
+    )
+
+    whl_from_dir_repo(
+        name = "whl_with_data2_whl",
+        root = "//tests/repos/whl_with_data2:BUILD.bazel",
+        output = "whl_with_data2-1.0-any-none-any.whl",
+    )
+    whl_library(
+        name = "whl_with_data2",
+        whl_file = "@whl_with_data2_whl//:whl_with_data2-1.0-any-none-any.whl",
+        requirement = "whl-with-data2",
+    )
+
     _whl_library_from_dir(
         name = "whl_library_extras_direct_dep",
         root = "//tests/pypi/whl_library/testdata/pkg:BUILD.bazel",
diff --git a/python/private/py_executable.bzl b/python/private/py_executable.bzl
index 375030ce91..ab09926faa 100644
--- a/python/private/py_executable.bzl
+++ b/python/private/py_executable.bzl
@@ -576,8 +576,10 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
     )
 
     venv_dir_map = {
-        VenvSymlinkKind.BIN: venv_details.bin_dir,
+        VenvSymlinkKind.BIN: "{}/{}".format(venv_ctx_rel_root, venv_details.bin_dir),
         VenvSymlinkKind.LIB: site_packages,
+        VenvSymlinkKind.INCLUDE: "{}/{}".format(venv_ctx_rel_root, venv_details.include_dir),
+        VenvSymlinkKind.DATA: "{}/data".format(venv_ctx_rel_root),
     }
     venv_app_files = create_venv_app_files(
         ctx,
@@ -659,7 +661,7 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
 
     recreate_venv_at_runtime = False
 
-    bin_dir = "{}/bin".format(venv_ctx_rel_root)
+    venv_bin_ctx_rel_path = "{}/bin".format(venv_ctx_rel_root)
     if create_full_venv:
         # Some wrappers around the interpreter (e.g. pyenv) use the program
         # name to decide what to do, so preserve the name.
@@ -671,7 +673,7 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
             # When the venv symlinks are disabled, the $venv/bin/python3 file isn't
             # needed or used at runtime. However, the zip code uses the interpreter
             # File object to figure out some paths.
-            interpreter = ctx.actions.declare_file("{}/{}".format(bin_dir, py_exe_basename))
+            interpreter = ctx.actions.declare_file("{}/{}".format(venv_bin_ctx_rel_path, py_exe_basename))
             ctx.actions.write(interpreter, "actual:{}".format(interpreter_actual_path))
 
         elif runtime.interpreter:
@@ -679,7 +681,7 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
             # declare_symlink() is required to ensure that the resulting file
             # in runfiles is always a symlink. An RBE implementation, for example,
             # may choose to write what symlink() points to instead.
-            interpreter = ctx.actions.declare_symlink("{}/{}".format(bin_dir, py_exe_basename))
+            interpreter = ctx.actions.declare_symlink("{}/{}".format(venv_bin_ctx_rel_path, py_exe_basename))
             interpreter_runfiles.add(interpreter)
 
             rel_path = relative_path(
@@ -690,7 +692,7 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
             )
             ctx.actions.symlink(output = interpreter, target_path = rel_path)
         else:
-            interpreter = ctx.actions.declare_symlink("{}/{}".format(bin_dir, py_exe_basename))
+            interpreter = ctx.actions.declare_symlink("{}/{}".format(venv_bin_ctx_rel_path, py_exe_basename))
             interpreter_runfiles.add(interpreter)
             ctx.actions.symlink(output = interpreter, target_path = runtime.interpreter_path)
     else:
@@ -715,7 +717,8 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
         interpreter = interpreter,
         pyvenv_cfg = pyvenv_cfg,
         site_packages = site_packages,
-        bin_dir = bin_dir,
+        bin_dir = "bin",
+        include_dir = "include",
         recreate_venv_at_runtime = recreate_venv_at_runtime,
         interpreter_runfiles = interpreter_runfiles.build(ctx),
         interpreter_symlinks = depset(),
@@ -777,7 +780,8 @@ def _create_venv_windows(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_
         interpreter = interpreter,
         pyvenv_cfg = None,
         site_packages = site_packages,
-        bin_dir = venv_bin_ctx_rel_path,
+        bin_dir = venv_bin_rel_path,
+        include_dir = "Include",
         recreate_venv_at_runtime = True,
         interpreter_runfiles = interpreter_runfiles.build(ctx),
         interpreter_symlinks = interpreter_symlinks.build(),
@@ -789,6 +793,7 @@ def _venv_details(
         pyvenv_cfg,
         site_packages,
         bin_dir,
+        include_dir,
         recreate_venv_at_runtime,
         interpreter_runfiles,
         interpreter_symlinks):
@@ -801,8 +806,10 @@ def _venv_details(
         pyvenv_cfg = pyvenv_cfg,
         # str; venv-relative path to the site-packages directory
         site_packages = site_packages,
-        # str; ctx-relative path to the venv's bin directory.
+        # str; venv-relative path to the venv's bin directory.
         bin_dir = bin_dir,
+        # str; venv-relative-path to the venv's include directory.
+        include_dir = include_dir,
         # bool; True if the venv needs to be recreated at runtime (because the
         # build-time construction isn't sufficient). False if the build-time
         # constructed venv is sufficient.
diff --git a/python/private/py_info.bzl b/python/private/py_info.bzl
index 8868b9d3b4..551e0bb48c 100644
--- a/python/private/py_info.bzl
+++ b/python/private/py_info.bzl
@@ -37,6 +37,12 @@ def _VenvSymlinkKind_typedef():
 
     Indicates to create paths under the venv's include directory.
     :::
+
+    :::{field} DATA
+    :type: object
+
+    Indicates to create paths under the venv's data directory.
+    :::
     """
 
 # buildifier: disable=name-conventions
@@ -45,6 +51,7 @@ VenvSymlinkKind = struct(
     BIN = "BIN",
     LIB = "LIB",
     INCLUDE = "INCLUDE",
+    DATA = "DATA",
 )
 
 def _VenvSymlinkEntry_init(**kwargs):
diff --git a/python/private/pypi/whl_library_targets.bzl b/python/private/pypi/whl_library_targets.bzl
index dc99aab532..a14c6c4ff8 100644
--- a/python/private/pypi/whl_library_targets.bzl
+++ b/python/private/pypi/whl_library_targets.bzl
@@ -43,6 +43,8 @@ _BAZEL_REPO_FILE_GLOBS = [
     "WORKSPACE.bazel",
 ]
 
+_IS_VENV_SITE_PACKAGES_YES = Label("//python/config_settings:_is_venvs_site_packages")
+
 def whl_library_targets_from_requires(
         *,
         name,
@@ -194,8 +196,10 @@ def whl_library_targets(
             DIST_INFO_LABEL: dict(
                 include = ["site-packages/*.dist-info/**"],
             ),
+
+            ## TO CHECK: should bin/ and include/ be part of the data target?
             DATA_LABEL: dict(
-                include = ["data/**"],
+                include = ["data/**", "bin/**", "include/**"],
             ),
         }
 
@@ -369,7 +373,7 @@ def whl_library_targets(
 
         if not enable_implicit_namespace_pkgs:
             generated_namespace_package_files = select({
-                Label("//python/config_settings:is_venvs_site_packages"): [],
+                _IS_VENV_SITE_PACKAGES_YES: [],
                 "//conditions:default": rules.create_inits(
                     srcs = srcs + data + pyi_srcs,
                     ignored_dirnames = [],  # If you need to ignore certain folders, you can patch rules_python here to do so.
@@ -379,6 +383,13 @@ def whl_library_targets(
             namespace_package_files += generated_namespace_package_files
             srcs = srcs + generated_namespace_package_files
 
+        # This must be doe after the above because create_inits() is macro-phase,
+        # so can't handle select() values.
+        data = data + select({
+            _IS_VENV_SITE_PACKAGES_YES: [DATA_LABEL],
+            "//conditions:default": [],
+        })
+
         rules.py_library(
             name = py_library_label,
             srcs = srcs,
diff --git a/python/private/venv_runfiles.bzl b/python/private/venv_runfiles.bzl
index 6daf0d4e5c..1c518bccc3 100644
--- a/python/private/venv_runfiles.bzl
+++ b/python/private/venv_runfiles.bzl
@@ -275,10 +275,16 @@ def _get_file_venv_path(ctx, f, site_packages_root):
 
     Returns:
         A tuple `(venv_path, rf_root_path)` if the file is under
-        `site_packages_root`, otherwise `(None, None)`.
+        `site_packages_root` or data/, bin/, include/ otherwise `(None, None)`.
     """
     rf_root_path = runfiles_root_path(ctx, f.short_path)
     _, _, repo_rel_path = rf_root_path.partition("/")
+
+    # Check for wheel data/bin/include folders first
+    for prefix in ["data/", "bin/", "include/"]:
+        if repo_rel_path.startswith(prefix):
+            return (repo_rel_path, rf_root_path)
+
     head, found_sp_root, venv_path = repo_rel_path.partition(site_packages_root)
     if head or not found_sp_root:
         # If head is set, then the path didn't start with site_packages_root
@@ -412,6 +418,11 @@ def get_venv_symlinks(
             if not cannot_be_linked_directly.get(dirname, False):
                 cannot_be_linked_directly[dirname] = True
 
+    # bin, include, and data are also shared across wheels, so we cannot link
+    # them directly if they are at the top level.
+    for dirname in ["bin", "include", "data"]:
+        cannot_be_linked_directly[dirname] = True
+
     # At this point, venv_symlinks has entries for the shared libraries
     # and cannot_be_linked_directly has the directories that cannot be
     # directly linked. Next, we loop over the remaining files and group
@@ -452,19 +463,36 @@ def get_venv_symlinks(
 
     # Finally, for each group, we create the VenvSymlinkEntry objects
     for venv_path, files in optimized_groups.items():
+        if venv_path.startswith("data/"):
+            out_venv_path = venv_path[len("data/"):]
+            kind = VenvSymlinkKind.DATA
+            prefix = ""
+        elif venv_path.startswith("include/"):
+            out_venv_path = venv_path[len("include/"):]
+            kind = VenvSymlinkKind.INCLUDE
+            prefix = ""
+        elif venv_path.startswith("bin/"):
+            out_venv_path = venv_path[len("bin/"):]
+            kind = VenvSymlinkKind.BIN
+            prefix = ""
+        else:
+            out_venv_path = venv_path
+            kind = VenvSymlinkKind.LIB
+            prefix = site_packages_root
+
         link_to_path = (
             _get_label_runfiles_repo(ctx, files[0].owner) +
             "/" +
-            site_packages_root +
+            prefix +
             venv_path
         )
         venv_symlinks[venv_path] = VenvSymlinkEntry(
-            kind = VenvSymlinkKind.LIB,
+            kind = kind,
             link_to_path = link_to_path,
             link_to_file = None,
             package = package,
             version = version_str,
-            venv_path = venv_path,
+            venv_path = out_venv_path,
             files = depset(files),
         )
 
diff --git a/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl b/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl
index 08715fbf77..25e4bc73aa 100644
--- a/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl
+++ b/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl
@@ -50,7 +50,7 @@ def _test_filegroups(env):
         },
         {
             "name": "data",
-            "srcs": ["data/**"],
+            "srcs": ["data/**", "bin/**", "include/**"],
             "visibility": ["//visibility:public"],
         },
         {
@@ -245,11 +245,11 @@ def _test_whl_and_library_deps_from_requires(env):
     env.expect.that_dict(py_library_call).contains_exactly({
         "name": "pkg",
         "srcs": ["site-packages/foo/SRCS.py"] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
         "pyi_srcs": ["site-packages/foo/PYI.pyi"],
-        "data": ["site-packages/foo/DATA.txt"],
+        "data": ["site-packages/foo/DATA.txt"] + select({Label("//python/config_settings:_is_venvs_site_packages"): ["data"], "//conditions:default": []}),
         "imports": ["site-packages"],
         "deps": ["@pypi//bar:pkg"] + select({
             ":is_include_bar_baz_true": ["@pypi//bar_baz:pkg"],
@@ -259,7 +259,7 @@ def _test_whl_and_library_deps_from_requires(env):
         "visibility": ["//visibility:public"],
         "experimental_venvs_site_packages": Label("//python/config_settings:venvs_site_packages"),
         "namespace_package_files": [] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
     })  # buildifier: @unsorted-dict-items
@@ -361,11 +361,11 @@ def _test_whl_and_library_deps(env):
     env.expect.that_dict(py_library_calls[0]).contains_exactly({
         "name": "pkg",
         "srcs": ["site-packages/foo/SRCS.py"] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
         "pyi_srcs": ["site-packages/foo/PYI.pyi"],
-        "data": ["site-packages/foo/DATA.txt"],
+        "data": ["site-packages/foo/DATA.txt"] + select({Label("//python/config_settings:_is_venvs_site_packages"): ["data"], "//conditions:default": []}),
         "imports": ["site-packages"],
         "deps": [
             "@pypi_bar_baz//:pkg",
@@ -386,7 +386,7 @@ def _test_whl_and_library_deps(env):
         "visibility": ["//visibility:public"],
         "experimental_venvs_site_packages": Label("//python/config_settings:venvs_site_packages"),
         "namespace_package_files": [] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
     })  # buildifier: @unsorted-dict-items
@@ -444,11 +444,11 @@ def _test_group(env):
     ).contains_exactly({
         "name": "_pkg",
         "srcs": ["site-packages/foo/srcs.py"] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
         "pyi_srcs": ["site-packages/foo/pyi.pyi"],
-        "data": ["site-packages/foo/data.txt"],
+        "data": ["site-packages/foo/data.txt"] + select({Label("//python/config_settings:_is_venvs_site_packages"): ["data"], "//conditions:default": []}),
         "imports": ["site-packages"],
         "deps": ["@pypi_bar_baz//:pkg"] + select({
             "@platforms//os:linux": ["@pypi_box//:pkg"],
@@ -459,7 +459,7 @@ def _test_group(env):
         "visibility": ["@pypi__config//_groups:__pkg__"],
         "experimental_venvs_site_packages": Label("//python/config_settings:venvs_site_packages"),
         "namespace_package_files": [] + select({
-            Label("//python/config_settings:is_venvs_site_packages"): [],
+            Label("//python/config_settings:_is_venvs_site_packages"): [],
             "//conditions:default": ["_create_inits_target"],
         }),
     })  # buildifier: @unsorted-dict-items
diff --git a/tests/repos/whl_with_data1/BUILD.bazel b/tests/repos/whl_with_data1/BUILD.bazel
new file mode 100644
index 0000000000..af49d1ebbf
--- /dev/null
+++ b/tests/repos/whl_with_data1/BUILD.bazel
@@ -0,0 +1 @@
+exports_files(glob(["*"]))
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/data/whl_with_data1/data_data_file.txt b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/data/whl_with_data1/data_data_file.txt
new file mode 100644
index 0000000000..39ec676600
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/data/whl_with_data1/data_data_file.txt
@@ -0,0 +1 @@
+from .data/data
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/headers/whl_with_data1/header_file.h b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/headers/whl_with_data1/header_file.h
new file mode 100644
index 0000000000..59c9bf78c2
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/headers/whl_with_data1/header_file.h
@@ -0,0 +1 @@
+from .data/headers
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/platlib/whl_with_data1/platlib_file.txt b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/platlib/whl_with_data1/platlib_file.txt
new file mode 100644
index 0000000000..b27295614f
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/platlib/whl_with_data1/platlib_file.txt
@@ -0,0 +1 @@
+from .data/platlib
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/purelib/whl_with_data1/__init__.py b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/purelib/whl_with_data1/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/purelib/whl_with_data1/data_file.txt b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/purelib/whl_with_data1/data_file.txt
new file mode 100644
index 0000000000..e547fe48ed
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/purelib/whl_with_data1/data_file.txt
@@ -0,0 +1 @@
+from .data
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.data/scripts/whl_script.sh b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/scripts/whl_script.sh
new file mode 100644
index 0000000000..1a2485251c
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.data/scripts/whl_script.sh
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/METADATA b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/METADATA
new file mode 100644
index 0000000000..f403970d7a
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/METADATA
@@ -0,0 +1,3 @@
+Metadata-Version: 2.1
+Name: whl-with-data1
+Version: 1.0
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/RECORD b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/RECORD
new file mode 100644
index 0000000000..72e405ffd7
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/RECORD
@@ -0,0 +1,6 @@
+whl_with_data1-1.0.data/platlib/whl_with_data1/platlib_file.txt,sha256=123,123
+whl_with_data1-1.0.data/scripts/whl_script.sh,sha256=123,123
+whl_with_data1-1.0.data/headers/whl_with_data1/header_file.h,sha256=123,123
+whl_with_data1-1.0.data/purelib/whl_with_data1/data_file.txt,sha256=123,123
+whl_with_data1-1.0.data/data/whl_with_data1/data_data_file.txt,sha256=123,123
+whl_with_data1-1.0.data/data/whl_with_data1/data_data_file.txt,sha256=123,123
diff --git a/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/WHEEL b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/WHEEL
new file mode 100644
index 0000000000..a64521a1cc
--- /dev/null
+++ b/tests/repos/whl_with_data1/whl_with_data1-1.0.dist-info/WHEEL
@@ -0,0 +1 @@
+Wheel-Version: 1.0
diff --git a/tests/repos/whl_with_data2/BUILD.bazel b/tests/repos/whl_with_data2/BUILD.bazel
new file mode 100644
index 0000000000..af49d1ebbf
--- /dev/null
+++ b/tests/repos/whl_with_data2/BUILD.bazel
@@ -0,0 +1 @@
+exports_files(glob(["*"]))
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/data/whl_with_data2/data_data_file.txt b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/data/whl_with_data2/data_data_file.txt
new file mode 100644
index 0000000000..39ec676600
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/data/whl_with_data2/data_data_file.txt
@@ -0,0 +1 @@
+from .data/data
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/headers/whl_with_data2/header_file.h b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/headers/whl_with_data2/header_file.h
new file mode 100644
index 0000000000..59c9bf78c2
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/headers/whl_with_data2/header_file.h
@@ -0,0 +1 @@
+from .data/headers
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/platlib/whl_with_data2/platlib_file.txt b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/platlib/whl_with_data2/platlib_file.txt
new file mode 100644
index 0000000000..b27295614f
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/platlib/whl_with_data2/platlib_file.txt
@@ -0,0 +1 @@
+from .data/platlib
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/purelib/whl_with_data2/__init__.py b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/purelib/whl_with_data2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/purelib/whl_with_data2/data_file.txt b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/purelib/whl_with_data2/data_file.txt
new file mode 100644
index 0000000000..e547fe48ed
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/purelib/whl_with_data2/data_file.txt
@@ -0,0 +1 @@
+from .data
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.data/scripts/whl_script.sh b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/scripts/whl_script.sh
new file mode 100644
index 0000000000..1a2485251c
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.data/scripts/whl_script.sh
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/METADATA b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/METADATA
new file mode 100644
index 0000000000..c762d184fb
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/METADATA
@@ -0,0 +1,3 @@
+Metadata-Version: 2.1
+Name: whl-with-data2
+Version: 1.0
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/RECORD b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/RECORD
new file mode 100644
index 0000000000..a879ae0a22
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/RECORD
@@ -0,0 +1,6 @@
+whl_with_data2-1.0.data/platlib/whl_with_data2/platlib_file.txt,sha256=123,123
+whl_with_data2-1.0.data/scripts/whl_script.sh,sha256=123,123
+whl_with_data2-1.0.data/headers/whl_with_data2/header_file.h,sha256=123,123
+whl_with_data2-1.0.data/purelib/whl_with_data2/data_file.txt,sha256=123,123
+whl_with_data2-1.0.data/data/whl_with_data2/data_data_file.txt,sha256=123,123
+whl_with_data2-1.0.data/data/whl_with_data2/data_data_file.txt,sha256=123,123
diff --git a/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/WHEEL b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/WHEEL
new file mode 100644
index 0000000000..a64521a1cc
--- /dev/null
+++ b/tests/repos/whl_with_data2/whl_with_data2-1.0.dist-info/WHEEL
@@ -0,0 +1 @@
+Wheel-Version: 1.0
diff --git a/tests/venv_site_packages_libs/BUILD.bazel b/tests/venv_site_packages_libs/BUILD.bazel
index 56f0eb0909..433a4b00b4 100644
--- a/tests/venv_site_packages_libs/BUILD.bazel
+++ b/tests/venv_site_packages_libs/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_python//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED")  # buildifier: disable=bzl-visibility
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//python:py_library.bzl", "py_library")
 load("//tests/support:py_reconfig.bzl", "py_reconfig_test")
@@ -32,6 +33,9 @@ py_reconfig_test(
     name = "venvs_site_packages_libs_test",
     srcs = ["bin.py"],
     bootstrap_impl = "script",
+    env = {
+        "BZLMOD_ENABLED": "1" if BZLMOD_ENABLED else "0",
+    },
     main = "bin.py",
     venvs_site_packages = "yes",
     deps = [
@@ -45,7 +49,10 @@ py_reconfig_test(
         "@other//nspkg_gamma",
         "@other//nspkg_single",
         "@other//with_external_data",
-    ],
+    ] + ([
+        "@whl_with_data1//:pkg",
+        "@whl_with_data2//:pkg",
+    ] if BZLMOD_ENABLED else []),
 )
 
 py_reconfig_test(
diff --git a/tests/venv_site_packages_libs/bin.py b/tests/venv_site_packages_libs/bin.py
index 439a964906..a40e1004cb 100644
--- a/tests/venv_site_packages_libs/bin.py
+++ b/tests/venv_site_packages_libs/bin.py
@@ -1,4 +1,5 @@
 import importlib
+import os
 import sys
 import unittest
 from pathlib import Path
@@ -70,7 +71,7 @@ def test_dirs_from_replaced_package_are_not_present(self):
         module_path = Path(module.__file__)
 
         site_packages = module_path.parent.parent
-        dist_info_dirs = [p.name for p in site_packages.glob("*.dist-info")]
+        dist_info_dirs = [p.name for p in site_packages.glob("simple*.dist-info")]
         self.assertEqual(
             ["simple-1.0.0.dist-info"],
             dist_info_dirs,
@@ -91,6 +92,98 @@ def test_data_from_another_pkg_is_included_via_copy_file(self):
         files = [p.name for p in d.glob("*")]
         self.assertIn("another_module_data.txt", files)
 
+    @unittest.skipIf(
+        os.environ.get("BZLMOD_ENABLED") == "0",
+        "whl_with_data1 is only available with bzlmod",
+    )
+    def test_whl_with_data1_included(self):
+        module = self.assert_imported_from_venv("whl_with_data1")
+        module_path = Path(module.__file__)
+        site_packages = module_path.parent.parent
+
+        # purelib
+        data_file = site_packages / "whl_with_data1" / "data_file.txt"
+        self.assertTrue(data_file.exists(), f"Expected {data_file} to exist")
+
+        # platlib
+        platlib_file = site_packages / "whl_with_data1" / "platlib_file.txt"
+        self.assertTrue(platlib_file.exists(), f"Expected {platlib_file} to exist")
+
+        venv_root = Path(self.venv)
+
+        is_windows = sys.platform == "win32"
+        if is_windows:
+            bin_dir_name = "Scripts"
+            include_dir_name = "Include"
+        else:
+            bin_dir_name = "bin"
+            include_dir_name = "include"
+
+        # data
+        data_data_file = venv_root / "data" / "whl_with_data1" / "data_data_file.txt"
+        self.assertTrue(
+            data_data_file.exists(),
+            f"Expected {data_data_file} to exist. venv_root contents: {list(venv_root.iterdir()) if venv_root.exists() else 'N/A'}. os.name={os.name}, sys.platform={sys.platform}",
+        )
+
+        # scripts
+        script_file = venv_root / bin_dir_name / "whl_script.sh"
+        self.assertTrue(
+            script_file.exists(),
+            f"Expected {script_file} to exist. {bin_dir_name} contents: {list((venv_root / bin_dir_name).iterdir()) if (venv_root / bin_dir_name).exists() else 'N/A'}",
+        )
+
+        # headers
+        header_file = venv_root / include_dir_name / "whl_with_data1" / "header_file.h"
+        self.assertTrue(
+            header_file.exists(),
+            f"Expected {header_file} to exist. {include_dir_name} contents: {list((venv_root / include_dir_name).iterdir()) if (venv_root / include_dir_name).exists() else 'N/A'}",
+        )
+
 
 if __name__ == "__main__":
     unittest.main()
+
+    @unittest.skipIf(
+        os.environ.get("BZLMOD_ENABLED") == "0",
+        "whl_with_data1 is only available with bzlmod",
+    )
+    def test_whl_with_data2_included(self):
+        module = self.assert_imported_from_venv("whl_with_data2")
+
+        venv_root = Path(module.__file__).parents[3]
+        site_packages = venv_root / "lib" / "site-packages"
+
+        data_file = site_packages / "whl_with_data2" / "data_file.txt"
+        self.assertTrue(data_file.exists(), data_file)
+        self.assertTrue(data_file.is_file(), data_file)
+
+        platlib_file = site_packages / "whl_with_data2" / "platlib_file.txt"
+        self.assertTrue(platlib_file.exists(), platlib_file)
+        self.assertTrue(platlib_file.is_file(), platlib_file)
+
+        script_file = venv_root / "bin" / "whl_script.sh"
+        self.assertTrue(script_file.exists(), script_file)
+        self.assertTrue(script_file.is_file(), script_file)
+
+        # Ensure that `data` files are unpacked in `venv/data/`
+        # and then linked as `venv/data/whl_with_data1/data_data_file.txt`.
+        data_data_file = venv_root / "data" / "whl_with_data2" / "data_data_file.txt"
+        self.assertTrue(data_data_file.exists(), data_data_file)
+        self.assertTrue(data_data_file.is_file(), data_data_file)
+        self.assertTrue(data_data_file.read_text() == "123\n")
+
+        # In python versions < 3.10, the `venv/include/pythonX.Y/` dir doesn't seem to get
+        # created but we don't care to support dropping includes there on that
+        # platform.
+        if sys.version_info >= (3, 10):
+            # Include dir is `include/pythonX.Y`.
+            include_dir_name = (
+                f"include/python{sys.version_info.major}.{sys.version_info.minor}"
+            )
+            header_file = (
+                venv_root / include_dir_name / "whl_with_data2" / "header_file.h"
+            )
+            self.assertTrue(header_file.exists(), header_file)
+            self.assertTrue(header_file.is_file(), header_file)
+            self.assertTrue(header_file.read_text() == "123\n")