diff --git a/.gitignore b/.gitignore
index 188dd9f55d8..d05352e7124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ InfoPlist.strings
 Makefile
 !admin/charsets/Makefile
 !etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
 !test/indent/Makefile
 makefile
 /*.cache
diff --git a/test/ChangeLog b/test/ChangeLog
index c4ff2c70147..6fa11867a5e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-16  Glenn Morris  <rgm@gnu.org>
+
+	* automated/flymake-tests.el (flymake-tests-data-directory):
+	Change from flymake/warnpred to more standard data/flymake.
+
 2014-12-11  Michael Albinus  <michael.albinus@gmx.de>
 
 	* automated/vc-tests.el (vc-test--revision-granularity-function):
diff --git a/test/automated/flymake/warnpred/Makefile b/test/automated/data/flymake/Makefile
similarity index 100%
rename from test/automated/flymake/warnpred/Makefile
rename to test/automated/data/flymake/Makefile
diff --git a/test/automated/flymake/warnpred/test.c b/test/automated/data/flymake/test.c
similarity index 100%
rename from test/automated/flymake/warnpred/test.c
rename to test/automated/data/flymake/test.c
diff --git a/test/automated/flymake/warnpred/test.pl b/test/automated/data/flymake/test.pl
similarity index 100%
rename from test/automated/flymake/warnpred/test.pl
rename to test/automated/data/flymake/test.pl
diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el
index e5f444e262b..2a18a5e30fb 100644
--- a/test/automated/flymake-tests.el
+++ b/test/automated/flymake-tests.el
@@ -26,7 +26,7 @@
 (require 'flymake)
 
 (defvar flymake-tests-data-directory
-  (expand-file-name "flymake/warnpred" (getenv "EMACS_TEST_DIRECTORY"))
+  (expand-file-name "data/flymake" (getenv "EMACS_TEST_DIRECTORY"))
   "Directory containing flymake test data.")