diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3dd3104e8fa..126c3fdb44d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-20  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* configure.ac: Remove HP-UX case.
+	* configure: Regenerate.
+
 2015-12-18  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* lib/gdb.exp (gdb_compile): Add function doc.
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index 0853e481201..687e06d5fe4 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -2273,8 +2273,6 @@ else
       fi ;;
     darwin* | rhapsody*)
       RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-    hpux*)
-      RPATH_ENVVAR=SHLIB_PATH ;;
   esac
 fi
 
diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac
index f7e9eea5f63..c5271e42fc8 100644
--- a/gdb/testsuite/configure.ac
+++ b/gdb/testsuite/configure.ac
@@ -77,8 +77,6 @@ else
       fi ;;
     darwin* | rhapsody*)
       RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-    hpux*)
-      RPATH_ENVVAR=SHLIB_PATH ;;
   esac
 fi
 AC_SUBST(RPATH_ENVVAR)