diff --git a/ChangeLog b/ChangeLog
index a67840a216..130ea8276a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-26  Ulrich Drepper  <drepper@gmail.com>
 
+	* conform/Makefile (tests): Run only when not cross-compiling and
+	when fast-check is not defined.
+
 	* conform/conformtest.pl: XPG7 and POSIX2008 require C99.
 	* conform/data/limits.h-data: Fixes for POSIX2008.
 	* conform/run-conformtest.sh: Run all tests.
diff --git a/conform/Makefile b/conform/Makefile
index d7d939ea61..f1f45ee201 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -25,7 +25,11 @@ distribute = conformtest.pl $(wildcard data/*.h-data) \
 
 include ../Rules
 
+ifneq (yes,$(fast-check))
+ifeq (no,$(cross-compiling))
 tests: $(objpfx)run-conformtest.out
+endif
+endif
 
 $(objpfx)run-conformtest.out: run-conformtest.sh conformtest.pl \
 			      $(wildcard data/*.h-data) \