diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2d1e90030b..6d929c7018 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/ld-i386/i386.exp: Also run for x86_64-*-elf* targets.
+	* testsuite/ld-i386/property-x86-4a.d: Pass -z separate-code to
+	ld.
+	* testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-4a.d: Likewise.
+
 2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-elf/elf.exp (ASFLAGS): Save, append
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 703c327ce1..21f5593249 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -109,6 +109,7 @@ if { !([istarget "i?86-*-elf*"]
        || [istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
        || [istarget "i?86-*-nacl*"]
+       || [istarget "x86_64-*-elf*"]
        || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {
diff --git a/ld/testsuite/ld-i386/property-x86-4a.d b/ld/testsuite/ld-i386/property-x86-4a.d
index 6d94b7360c..8ab0115cdd 100644
--- a/ld/testsuite/ld-i386/property-x86-4a.d
+++ b/ld/testsuite/ld-i386/property-x86-4a.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --32 -mx86-used-note=yes
-#ld: -m elf_i386 --gc-sections --entry=main
+#ld: -m elf_i386 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
index 7c6a2e129b..9dd6e3540e 100644
--- a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --x32 -mx86-used-note=yes
-#ld: -m elf32_x86_64 --gc-sections --entry=main
+#ld: -m elf32_x86_64 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/ld/testsuite/ld-x86-64/property-x86-4a.d b/ld/testsuite/ld-x86-64/property-x86-4a.d
index 8637ed4e98..4dc87acd56 100644
--- a/ld/testsuite/ld-x86-64/property-x86-4a.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
-#ld: -m elf_x86_64 --gc-sections --entry=main
+#ld: -m elf_x86_64 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property