diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index c8162bc847..0dfc0dda25 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1668,7 +1668,7 @@ static int loadAllObjects(const unsigned int bpfloader_ver) {
     // S+ Tethering mainline module (network_stack): tether offload
     // loads under /sys/fs/bpf/tethering:
     if (loadObject(bpfloader_ver, "tethering/", "offload.o")) return 1;
-    if (loadObject(bpfloader_ver, "tethering/", "test.o")) return 1;
+    if (loadObject(bpfloader_ver, "", "test.o")) return 1;
     if (isAtLeastT) {
         // T+ Tethering mainline module loads under:
         // /sys/fs/bpf/net_shared: shared with netd & system server
diff --git a/bpf/progs/test.c b/bpf/progs/test.c
index 64dc0c8434..3f3178bd26 100644
--- a/bpf/progs/test.c
+++ b/bpf/progs/test.c
@@ -16,6 +16,7 @@
 
 // The resulting .o needs to load on Android S+
 #define BPFLOADER_MIN_VER BPFLOADER_MAINLINE_S_VERSION
+#define DEFAULT_BPF_PIN_SUBDIR "tethering/"
 
 // This is non production code, only used for testing
 // Needed because the bitmap array definition is non-kosher for pre-T OS devices.