diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7cd9e7c122..041778e67c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR ld/21233
+	* testsuite/ld-elf/shared.exp: Remove kfails.
+
 2017-10-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/22269
diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index 640d324baa..a40f8e0f59 100644
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -135,8 +135,6 @@ if { [check_gc_sections_available] } {
 	    {{readelf --dyn-syms pr21233-l.sd}} \
 	    "libpr21233.so"]]
 
-    setup_kfail "cris*-*-*" "ld/21233"
-
     run_ld_link_tests [list \
 	[list \
 	    "PR ld/21233 dynamic symbols with section GC (--undefined)" \
@@ -146,8 +144,6 @@ if { [check_gc_sections_available] } {
 	    {{readelf --dyn-syms pr21233.sd}} \
 	    "pr21233-1"]]
 
-    setup_kfail "cris*-*-*" "ld/21233"
-
     run_ld_link_tests [list \
 	[list \
 	    "PR ld/21233 dynamic symbols with section GC (--require-defined)" \
@@ -158,8 +154,6 @@ if { [check_gc_sections_available] } {
 	    {{readelf --dyn-syms pr21233.sd}} \
 	    "pr21233-2"]]
 
-    setup_kfail "cris*-*-*" "ld/21233"
-
     run_ld_link_tests [list \
 	[list \
 	    "PR ld/21233 dynamic symbols with section GC (EXTERN)" \