diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog
index efc90956e3..c94c37eada 100644
--- a/testsuites/ChangeLog
+++ b/testsuites/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* aclocal/check-cpuopts.m4: Check rtems/system.h instead of
+	rtems/score/cpuopts.h.
+
 2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: New BUG-REPORT address.
diff --git a/testsuites/aclocal/check-cpuopts.m4 b/testsuites/aclocal/check-cpuopts.m4
index a6481486cd..159c12777a 100644
--- a/testsuites/aclocal/check-cpuopts.m4
+++ b/testsuites/aclocal/check-cpuopts.m4
@@ -14,7 +14,7 @@ AC_CACHE_CHECK(
   [for $1],
   [rtems_cv_$1],
   [AC_COMPILE_IFELSE([
-#include <rtems/score/cpuopts.h>
+#include <rtems/system.h>
 #ifndef $1
 choke me
 #endif