diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3982f520cb..c4bd94b678 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -673,8 +673,6 @@ if(BUILD_TESTING)
     "${CMake_BINARY_DIR}/Tests/CMakeBuildDoubleProjectTest.cmake")
   list(APPEND TEST_BUILD_DIRS ${CMAKE_BUILD_TEST_BINARY_DIR})
 
-  ADD_TEST_MACRO(Module.CheckTypeSize CheckTypeSize)
-
   set(Module.CheckIPOSupported-C_BUILD_OPTIONS -DCMake_TEST_IPO_WORKS_C=${CMake_TEST_IPO_WORKS_C})
   ADD_TEST_MACRO(Module.CheckIPOSupported-C CheckIPOSupported-C)
 
diff --git a/Tests/RunCMake/CheckModules/CheckTypeSize.cmake b/Tests/RunCMake/CheckModules/CheckTypeSize.cmake
new file mode 100644
index 0000000000..97201a5675
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckTypeSize.cmake
@@ -0,0 +1,2 @@
+enable_testing()
+add_subdirectory(CheckTypeSize)
diff --git a/Tests/Module/CheckTypeSize/CMakeLists.txt b/Tests/RunCMake/CheckModules/CheckTypeSize/CMakeLists.txt
similarity index 96%
rename from Tests/Module/CheckTypeSize/CMakeLists.txt
rename to Tests/RunCMake/CheckModules/CheckTypeSize/CMakeLists.txt
index 397196d62a..7d1181e9e8 100644
--- a/Tests/Module/CheckTypeSize/CMakeLists.txt
+++ b/Tests/RunCMake/CheckModules/CheckTypeSize/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
 project(CheckTypeSize)
 
 # Check C types
@@ -37,3 +36,5 @@ include_directories("${CheckTypeSize_BINARY_DIR}")
 
 add_executable(CheckTypeSize CheckTypeSize.c)
 add_executable(CheckTypeSizeCXX CheckTypeSize.cxx)
+
+add_test(NAME CheckTypeSize COMMAND CheckTypeSize)
diff --git a/Tests/Module/CheckTypeSize/CheckTypeSize.c b/Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.c
similarity index 99%
rename from Tests/Module/CheckTypeSize/CheckTypeSize.c
rename to Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.c
index eb1aa94f21..c4a49f6079 100644
--- a/Tests/Module/CheckTypeSize/CheckTypeSize.c
+++ b/Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.c
@@ -143,7 +143,7 @@ int main(void)
   NODEF(SIZEOF_STRUCTMEMBER_PTR);
 #endif
 
-/* struct somestruct::someint */
+/* struct somestruct::somechar */
 #if defined(SIZEOF_STRUCTMEMBER_CHAR)
   CHECK(x.somechar, SIZEOF_STRUCTMEMBER_CHAR);
   CHECK(x.somechar, SIZEOF_CHAR);
diff --git a/Tests/Module/CheckTypeSize/CheckTypeSize.cxx b/Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.cxx
similarity index 100%
rename from Tests/Module/CheckTypeSize/CheckTypeSize.cxx
rename to Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.cxx
diff --git a/Tests/Module/CheckTypeSize/config.h.in b/Tests/RunCMake/CheckModules/CheckTypeSize/config.h.in
similarity index 100%
rename from Tests/Module/CheckTypeSize/config.h.in
rename to Tests/RunCMake/CheckModules/CheckTypeSize/config.h.in
diff --git a/Tests/Module/CheckTypeSize/config.hxx.in b/Tests/RunCMake/CheckModules/CheckTypeSize/config.hxx.in
similarity index 100%
rename from Tests/Module/CheckTypeSize/config.hxx.in
rename to Tests/RunCMake/CheckModules/CheckTypeSize/config.hxx.in
diff --git a/Tests/Module/CheckTypeSize/someclass.hxx b/Tests/RunCMake/CheckModules/CheckTypeSize/someclass.hxx
similarity index 100%
rename from Tests/Module/CheckTypeSize/someclass.hxx
rename to Tests/RunCMake/CheckModules/CheckTypeSize/someclass.hxx
diff --git a/Tests/Module/CheckTypeSize/somestruct.h b/Tests/RunCMake/CheckModules/CheckTypeSize/somestruct.h
similarity index 100%
rename from Tests/Module/CheckTypeSize/somestruct.h
rename to Tests/RunCMake/CheckModules/CheckTypeSize/somestruct.h
diff --git a/Tests/RunCMake/CheckModules/RunCMakeTest.cmake b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake
index 762204e1e8..774e745c44 100644
--- a/Tests/RunCMake/CheckModules/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake
@@ -17,6 +17,17 @@ run_cmake(CheckTypeSizeMixedArgs)
 
 run_cmake(CheckTypeSizeOkNoC)
 
+block()
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CheckTypeSize-build)
+  run_cmake(CheckTypeSize)
+
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OUTPUT_MERGE 1)
+
+  run_cmake_command(CheckTypeSize-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(CheckTypeSize-build ${CMAKE_CTEST_COMMAND} -C Debug)
+endblock()
+
 run_cmake(CheckIncludeFilesOk)
 run_cmake(CheckIncludeFilesOkNoC)
 run_cmake(CheckIncludeFilesMissingLanguage)