diff --git a/build_defs/intellij_plugin.bzl b/build_defs/intellij_plugin.bzl
index 207435d8cc5..3a827e42a46 100644
--- a/build_defs/intellij_plugin.bzl
+++ b/build_defs/intellij_plugin.bzl
@@ -131,7 +131,7 @@ def _intellij_plugin_jar_impl(ctx):
   module_to_merged_xmls = _merge_optional_plugin_xmls(ctx)
   final_plugin_xml_file = _add_optional_dependencies_to_plugin_xml(ctx, module_to_merged_xmls.keys())
   jar_file = _package_meta_inf_files(ctx, final_plugin_xml_file, module_to_merged_xmls)
-  files = set([jar_file])
+  files = depset([jar_file])
   return struct(
       files = files,
   )
diff --git a/build_defs/intellij_plugin_debug_target.bzl b/build_defs/intellij_plugin_debug_target.bzl
index 37ec6f6b028..2b3da2376a3 100644
--- a/build_defs/intellij_plugin_debug_target.bzl
+++ b/build_defs/intellij_plugin_debug_target.bzl
@@ -95,7 +95,7 @@ def _build_deploy_info_file(deploy_file):
   )
 
 def _intellij_plugin_debug_target_impl(ctx):
-  files = set()
+  files = depset()
   deploy_files = []
   for target in ctx.attr.deps:
     files = files | target.files
@@ -108,8 +108,8 @@ def _intellij_plugin_debug_target_impl(ctx):
 
   # We've already consumed any dependent intellij_plugin_debug_targets into our own,
   # do not build or report these
-  files = set([f for f in files if not f.path.endswith(SUFFIX)])
-  files = files | set([output])
+  files = depset([f for f in files if not f.path.endswith(SUFFIX)])
+  files = files | depset([output])
 
   return struct(
       files = files,
diff --git a/testing/test_defs.bzl b/testing/test_defs.bzl
index 8ee1992fe74..cac54430d13 100644
--- a/testing/test_defs.bzl
+++ b/testing/test_defs.bzl
@@ -181,7 +181,7 @@ def _get_test_class(test_src, test_package_root):
 
 def _get_test_srcs(targets):
   """Returns all files of the given targets that end with Test.java."""
-  files = set()
+  files = depset()
   for target in targets:
     files += target.files
   return [f for f in files if f.basename.endswith("Test.java")]