diff --git a/test/escape_runtime_atomic.go b/test/escape_runtime_atomic.go
new file mode 100644
index 00000000000..6dfd4aa211a
--- /dev/null
+++ b/test/escape_runtime_atomic.go
@@ -0,0 +1,33 @@
+// errorcheck -0 -m -l
+
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Test escape analysis for runtime/internal/atomic.
+
+package escape
+
+import (
+	"runtime/internal/atomic"
+	"unsafe"
+)
+
+// BAD: should be "leaking param content".
+func Loadp(addr unsafe.Pointer) unsafe.Pointer { // ERROR "leaking param: addr"
+	return atomic.Loadp(addr)
+}
+
+var ptr unsafe.Pointer
+
+func Storep() {
+	var x int // ERROR "moved to heap: x"
+	atomic.StorepNoWB(unsafe.Pointer(&ptr), unsafe.Pointer(&x))
+}
+
+func Casp1() {
+	// BAD: x doesn't need to be heap allocated
+	var x int // ERROR "moved to heap: x"
+	var y int // ERROR "moved to heap: y"
+	atomic.Casp1(&ptr, unsafe.Pointer(&x), unsafe.Pointer(&y))
+}
diff --git a/test/escape_sync_atomic.go b/test/escape_sync_atomic.go
new file mode 100644
index 00000000000..8da71a0ccf3
--- /dev/null
+++ b/test/escape_sync_atomic.go
@@ -0,0 +1,38 @@
+// errorcheck -0 -m -l
+
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Test escape analysis for sync/atomic.
+
+package escape
+
+import (
+	"sync/atomic"
+	"unsafe"
+)
+
+// BAD: should be "leaking param content".
+func LoadPointer(addr *unsafe.Pointer) unsafe.Pointer { // ERROR "leaking param: addr"
+	return atomic.LoadPointer(addr)
+}
+
+var ptr unsafe.Pointer
+
+func StorePointer() {
+	var x int // ERROR "moved to heap: x"
+	atomic.StorePointer(&ptr, unsafe.Pointer(&x))
+}
+
+func SwapPointer() {
+	var x int // ERROR "moved to heap: x"
+	atomic.SwapPointer(&ptr, unsafe.Pointer(&x))
+}
+
+func CompareAndSwapPointer() {
+	// BAD: x doesn't need to be heap allocated
+	var x int // ERROR "moved to heap: x"
+	var y int // ERROR "moved to heap: y"
+	atomic.CompareAndSwapPointer(&ptr, unsafe.Pointer(&x), unsafe.Pointer(&y))
+}