diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc4fe7cdaac..1d510321d3b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-08-05  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.dwarf2/clztest.exp, gdb.dwarf2/dw2-common-block.exp,
+	gdb.dwarf2/dw2-dup-frame.exp, gdb.dwarf2/dw2-reg-undefined.exp,
+	gdb.dwarf2/dw2-single-line-discriminators.exp,
+	dw2-undefined-ret-addr.exp: Pass nopie to compilation options.
+
 2020-08-05  Tom Tromey  <tromey@adacore.com>
 
 	PR rust/26197:
diff --git a/gdb/testsuite/gdb.dwarf2/clztest.exp b/gdb/testsuite/gdb.dwarf2/clztest.exp
index b83b4a94e92..95c326660f5 100644
--- a/gdb/testsuite/gdb.dwarf2/clztest.exp
+++ b/gdb/testsuite/gdb.dwarf2/clztest.exp
@@ -28,7 +28,8 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
     return 0
 }
 
-if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } {
+if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S \
+      {nodebug nopie additional_flags=-nostdlib}] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
index 9bcf06b17f9..6a10ced6cac 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
@@ -33,7 +33,7 @@ if {[skip_fortran_tests]} {
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile \
-	  {nodebug f90}] } {
+      {nodebug nopie f90}] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
index 0c2c88e9c71..b6151084f20 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
@@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {
 
 standard_testfile .S
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug nopie}] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
index 564ca91ab9b..29564face30 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
@@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {
 
 standard_testfile .S
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug nopie}] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
index 4ca258a3f14..9803ef829a8 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
@@ -31,7 +31,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
 standard_testfile .S
 set csrcfile ${testfile}.c
 
-if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug nopie}] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
index e78d7112bed..668ecfc9ab7 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
@@ -26,7 +26,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
     return 0
 }
 
-if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile {nodebug}]} {
+if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile {nodebug nopie}]} {
     return -1
 }