diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index 8ed39738d..42f7454f4 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -23,7 +23,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
 
   set(filename ${testname}.cpp)
   add_executable(${targetname} ${filename})
-  add_dependencies(btest ${targetname})
+  add_dependencies(buildtests ${targetname})
 
   if(EIGEN_NO_ASSERTION_CHECKING)
     ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 2d40e32ae..b75e99d5e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,3 +1,3 @@
-configure_file(mctestr.in ${CMAKE_BINARY_DIR}/mctestr)
+configure_file(check.in ${CMAKE_BINARY_DIR}/check)
 configure_file(debug.in ${CMAKE_BINARY_DIR}/debug)
 configure_file(release.in ${CMAKE_BINARY_DIR}/release)
diff --git a/scripts/mctestr.in b/scripts/check.in
similarity index 100%
rename from scripts/mctestr.in
rename to scripts/check.in
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5cea1a582..b074c8842 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,9 @@
 project(EigenTesting)
-add_custom_target(btest)
+add_custom_target(buildtests)
+add_custom_target(check COMMAND "ctest")
+add_dependencies(check buildtests)
+
+
 include(EigenTesting)
 ei_init_testing()
 
@@ -163,4 +167,4 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 ei_add_property(EIGEN_TESTING_SUMMARY "CXX_FLAGS:         ${CMAKE_CXX_FLAGS}\n")
 ei_add_property(EIGEN_TESTING_SUMMARY "Sparse lib flags:  ${SPARSE_LIBS}\n")
 
-configure_file(maketests.in ${CMAKE_BINARY_DIR}/maketests)
+configure_file(buildtests.in ${CMAKE_BINARY_DIR}/buildtests)
diff --git a/test/maketests.in b/test/buildtests.in
similarity index 100%
rename from test/maketests.in
rename to test/buildtests.in
diff --git a/test/mixingtypes.cpp b/test/mixingtypes.cpp
index 1dcd77a8a..71c2dcb18 100644
--- a/test/mixingtypes.cpp
+++ b/test/mixingtypes.cpp
@@ -23,6 +23,9 @@
 // License and a copy of the GNU General Public License along with
 // Eigen. If not, see <http://www.gnu.org/licenses/>.
 
+// work around "uninitialized" warnings and give that option some testing
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+
 #ifndef EIGEN_NO_STATIC_ASSERT
 #define EIGEN_NO_STATIC_ASSERT // turn static asserts into runtime asserts in order to check them
 #endif