diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 982f3206ef2..eca66283285 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-20  Ian Lance Taylor  <iant@google.com>
+
+	PR go/66406
+	* go.test/go-test.exp (go-gc-tests): Skip nilptr.go if PIE.
+
 2015-11-20  Mike Stump  <mikestump@comcast.net>
 
 	* g++.dg/init/vbase1.C: Only run on x86_64-*-* as this testcase
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index d57751c89af..fd3e6a09f9e 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -398,6 +398,11 @@ proc go-gc-tests { } {
 	    }
 	}
 
+	if [check_effective_target_pie_enabled] {
+	    untested $test
+	    continue
+	}
+
 	if { [file tail $test] == "init1.go" } {
 	    # This tests whether GC runs during init, which for gccgo
 	    # it currently does not.