diff --git a/.gitmodules b/.gitmodules
index d2cbb20514b3e533d941bcbd07402efa257e35c5..cbb1aa4a09c22cbda73aa7438d6a5dc93876578d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "ThirdParty/tclap"]
 	path = ThirdParty/tclap
 	url = https://github.com/ufz/tclap.git
+[submodule "ThirdParty/autocheck"]
+	path = ThirdParty/autocheck
+	url = https://github.com/thejohnfreeman/autocheck.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd16db595885c740e7788b6dab7043d631393f3..0821daf02cc920d89da0d47b0cc8313bafdee99c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,7 @@ add_subdirectory( ThirdParty )
 include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty )
 include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gtest/include )
 include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/quickcheck )
+include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/autocheck/include )
 include_directories( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib )
 include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include )
 
diff --git a/ThirdParty/autocheck b/ThirdParty/autocheck
new file mode 160000
index 0000000000000000000000000000000000000000..49af9638d40e21e8c4f1ad5b1fed3e75b825e8ff
--- /dev/null
+++ b/ThirdParty/autocheck
@@ -0,0 +1 @@
+Subproject commit 49af9638d40e21e8c4f1ad5b1fed3e75b825e8ff
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 414ee031786a0984ec9148662381ed95d8107180..ab687146532a5c837db3ad6016a8c7a8dcabaf94 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -6,6 +6,7 @@ if(NOT OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT)
 endif()
 set(REQUIRED_SUBMODULES
 	ThirdParty/quickcheck
+	ThirdParty/autocheck
 	ThirdParty/vtkdiff
 	ThirdParty/tclap
 	${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}