3 files changed, 6 insertions, 4 deletions
diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl
index 405e03832..05c75b130 100644
--- a/test/runner/defs.bzl
+++ b/test/runner/defs.bzl
@@ -135,6 +135,7 @@ def syscall_test(
         add_overlay = False,
         add_uds_tree = False,
         add_hostinet = False,
+        vfs1 = True,
         vfs2 = True,
         fuse = False,
         debug = True,
@@ -148,6 +149,7 @@ def syscall_test(
       add_overlay: add an overlay test.
       add_uds_tree: add a UDS test.
       add_hostinet: add a hostinet test.
+      vfs1: enable VFS1 tests. Could be false only if vfs2 is true.
       vfs2: enable VFS2 support.
       fuse: enable FUSE support.
       debug: enable debug output.
@@ -157,7 +159,7 @@ def syscall_test(
     if not tags:
         tags = []
 
-    if vfs2 and not fuse:
+    if vfs2 and vfs1 and not fuse:
         # Generate a vfs1 plain test. Most testing will now be
         # biased towards vfs2, with only a single vfs1 case.
         _syscall_test(
@@ -171,7 +173,7 @@ def syscall_test(
             **kwargs
         )
 
-    if not fuse:
+    if vfs1 and not fuse:
         # Generate a native test if fuse is not required.
         _syscall_test(
             test = test,
diff --git a/test/runner/setup_container/BUILD b/test/runner/setup_container/BUILD
index 5b99d1de9..f879ef649 100644
--- a/test/runner/setup_container/BUILD
+++ b/test/runner/setup_container/BUILD
@@ -12,8 +12,8 @@ cc_binary(
     visibility = ["//test/runner:__subpackages__"],
     deps = [
         "//test/syscalls/linux:socket_netlink_util",
-        "//test/syscalls/linux:socket_test_util",
         "//test/util:capability_util",
         "//test/util:posix_error",
+        "//test/util:socket_util",
     ],
 )
diff --git a/test/runner/setup_container/setup_container.cc b/test/runner/setup_container/setup_container.cc
index 9a4e3fb8b..e6fae37e1 100644
--- a/test/runner/setup_container/setup_container.cc
+++ b/test/runner/setup_container/setup_container.cc
@@ -17,9 +17,9 @@
 #include <unistd.h>
 
 #include "test/syscalls/linux/socket_netlink_util.h"
-#include "test/syscalls/linux/socket_test_util.h"
 #include "test/util/capability_util.h"
 #include "test/util/posix_error.h"
+#include "test/util/socket_util.h"
 
 namespace gvisor {
 namespace testing {