diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2059a6575e9..daaa0817635 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/gas/elf/elf.exp: Skip tests for common directive on
+	hpux.
+
 2016-02-22  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* output-file.c (output_file_create): Make file name argument const.
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 40dfd12ae45..2ed764d2e1c 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -214,8 +214,11 @@ if { [is_elf_format] } then {
 
     run_dump_test "syms"
     
-    run_dump_test "common1"
-    run_dump_test "common2"
+    # hpux has a non-standard common directive.
+    if { ![istarget "*-*-hpux*"] } then {
+	run_dump_test "common1"
+	run_dump_test "common2"
+    }
 
     run_dump_test "strtab"