diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index be352557fbd..65e918e8466 100644
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -26,7 +26,7 @@ var Exitsyscall = exitsyscall
 var LockedOSThread = lockedOSThread
 
 type LFNode struct {
-	Next    *LFNode
+	Next    uint64
 	Pushcnt uintptr
 }
 
diff --git a/src/runtime/lfstack_test.go b/src/runtime/lfstack_test.go
index e5187770453..68f221d6ef8 100644
--- a/src/runtime/lfstack_test.go
+++ b/src/runtime/lfstack_test.go
@@ -121,7 +121,7 @@ func TestLFStackStress(t *testing.T) {
 			}
 			cnt++
 			sum2 += node.data
-			node.Next = nil
+			node.Next = 0
 		}
 	}
 	if cnt != K {
diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index cbbf6b3fc03..c1bba423a15 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -571,6 +571,7 @@ enum {
 #endif
 
 // Lock-free stack node.
+// Also known to export_test.go.
 struct LFNode
 {
 	uint64	next;