diff --git a/src/dev.zig b/src/dev.zig
index 9746b307af7778706d38d08a89c3e1360de7d960..0d365c3e19f28f685154b2797d889094fe742297 100644
--- a/src/dev.zig
+++ b/src/dev.zig
@@ -23,7 +23,7 @@ pub const Env = enum {
     sema,
 
     /// - sema
-    /// - `zig build-* -fno-llvm -fno-lld -target x86_64-linux`
+    /// - `zig build-* -fincremental -fno-llvm -fno-lld -target x86_64-linux --listen=-`
     @"x86_64-linux",
 
     /// - sema
@@ -130,6 +130,8 @@ pub const Env = enum {
                 else => Env.ast_gen.supports(feature),
             },
             .@"x86_64-linux" => switch (feature) {
+                .stdio_listen,
+                .incremental,
                 .x86_64_backend,
                 .elf_linker,
                 => true,
diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig
index 84b54aabcd57cba00ea36582c9c51ed74d16714a..1e29ab8bf60604d6cabee1810686699b73a30a31 100644
--- a/src/link/Elf/ZigObject.zig
+++ b/src/link/Elf/ZigObject.zig
@@ -1496,7 +1496,7 @@ pub fn updateFunc(
             });
             defer gpa.free(name);
             const osec = if (self.text_index) |sect_sym_index|
-                self.atom(self.symbol(sect_sym_index).ref.index).?.output_section_index
+                self.symbol(sect_sym_index).output_section_index
             else osec: {
                 const osec = try elf_file.addSection(.{
                     .name = try elf_file.insertShString(".text"),
@@ -1896,12 +1896,13 @@ pub fn deleteExport(
     } orelse return;
     const zcu = elf_file.base.comp.zcu.?;
     const exp_name = name.toSlice(&zcu.intern_pool);
-    const esym_index = metadata.@"export"(self, exp_name) orelse return;
+    const sym_index = metadata.@"export"(self, exp_name) orelse return;
     log.debug("deleting export '{s}'", .{exp_name});
-    const esym = &self.symtab.items(.elf_sym)[esym_index.*];
+    const esym_index = self.symbol(sym_index.*).esym_index;
+    const esym = &self.symtab.items(.elf_sym)[esym_index];
     _ = self.globals_lookup.remove(esym.st_name);
     esym.* = Elf.null_sym;
-    self.symtab.items(.shndx)[esym_index.*] = elf.SHN_UNDEF;
+    self.symtab.items(.shndx)[esym_index] = elf.SHN_UNDEF;
 }
 
 pub fn getGlobalSymbol(self: *ZigObject, elf_file: *Elf, name: []const u8, lib_name: ?[]const u8) !u32 {
diff --git a/test/incremental/add_decl b/test/incremental/add_decl
index a2863d6bde0fb301939f59cd8ae3487fa098867f..6b3a0dad8497fe073b03ebacf4e23c38dba006b3 100644
--- a/test/incremental/add_decl
+++ b/test/incremental/add_decl
@@ -1,5 +1,4 @@
-// Disabled on self-hosted due to linker crash
-// #target=x86_64-linux-selfhosted
+#target=x86_64-linux-selfhosted
 #target=x86_64-linux-cbe
 #target=x86_64-windows-cbe
 #update=initial version
diff --git a/test/incremental/fix_astgen_failure b/test/incremental/fix_astgen_failure
index b94c9c77ee4c1d1336d92eafa205ba3ad7c169c7..2298bc5248f63d6b9d2e35686a2cfe347e0d1c88 100644
--- a/test/incremental/fix_astgen_failure
+++ b/test/incremental/fix_astgen_failure
@@ -1,5 +1,4 @@
-// Disabled on self-hosted due to linker crash
-// #target=x86_64-linux-selfhosted
+#target=x86_64-linux-selfhosted
 #target=x86_64-linux-cbe
 #target=x86_64-windows-cbe
 #update=initial version with error
diff --git a/test/incremental/function_becomes_inline b/test/incremental/function_becomes_inline
index b7e604bfac44532a5b553f64800532bf97dfe5f8..607cd6805eb60121fd5d6ec9f9e4f316636db10b 100644
--- a/test/incremental/function_becomes_inline
+++ b/test/incremental/function_becomes_inline
@@ -1,4 +1,4 @@
-//#target=x86_64-linux-selfhosted
+#target=x86_64-linux-selfhosted
 #target=x86_64-linux-cbe
 #target=x86_64-windows-cbe
 #update=non-inline version
diff --git a/test/incremental/recursive_function_becomes_non_recursive b/test/incremental/recursive_function_becomes_non_recursive
index 7a9eb5d26f4f93288f6d71b9cba4be2e9d3ea460..e6f27bf2b4168bad9f92dc1dde2051f900f36bac 100644
--- a/test/incremental/recursive_function_becomes_non_recursive
+++ b/test/incremental/recursive_function_becomes_non_recursive
@@ -1,4 +1,4 @@
-//#target=x86_64-linux-selfhosted
+#target=x86_64-linux-selfhosted
 #target=x86_64-linux-cbe
 #target=x86_64-windows-cbe
 #update=initial version