diff --git a/test/ChangeLog b/test/ChangeLog
index ede6bd6476b..11bf34d901c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-24  Glenn Morris  <rgm@gnu.org>
+
+	* automated/regexp-tests.el: Require regexp-opt, which is
+	not preloaded --without-x.
+
 2015-01-23  Dmitry Gutov  <dgutov@yandex.ru>
 
 	Fix package tests when TMPDIR is in HOME.  (Bug#19657)
diff --git a/test/automated/regexp-tests.el b/test/automated/regexp-tests.el
index 31a4ee958c6..ee177b3e2e9 100644
--- a/test/automated/regexp-tests.el
+++ b/test/automated/regexp-tests.el
@@ -23,6 +23,8 @@
 
 ;;; Code:
 
+(require 'regexp-opt)
+
 (ert-deftest regexp-test-regexp-opt ()
   "Test the `compilation-error-regexp-alist' regexps.
 The test data is in `compile-tests--test-regexps-data'."