diff --git a/gdb.changes b/gdb.changes
index db491a7..cbd47f1 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 12 13:26:01 UTC 2018 - tdevries@suse.com
+
+- Run tests with -fno-PIE/-no-pie and -fPIE/-pie.
+
 -------------------------------------------------------------------
 Wed Nov  7 15:04:28 UTC 2018 - tdevries@suse.com
 
diff --git a/gdb.spec b/gdb.spec
index d572515..768b6ae 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -885,7 +885,11 @@ $CC -o ./orphanripper %{SOURCE2} -Wall -lutil -ggdb2
 
   # Run all the scheduled testsuite runs also in the PIE mode.
   # See also: gdb-runtest-pie-override.exp
-  CHECK="$(echo $CHECK|sed 's#check//unix/[^ ]*#& &/-fPIC/-pie#g')"
+  if rpm -q gcc-PIE; then
+      CHECK="$(echo $CHECK | sed 's#check//unix/[^ ]*#& &/-fno-PIE/-no-pie#g')"
+  else
+      CHECK="$(echo $CHECK | sed 's#check//unix/[^ ]*#& &/-fPIE/-pie#g')"
+  fi
 
   ./orphanripper make %{?_smp_mflags} -k $CHECK || :
 )