diff --git a/.gitmodules b/.gitmodules
index 56e05dc20ecf813e251913775eadc2c7f9fbcc84..cf30111f2fbaa67f2f34074eafc67606a638ecb3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "ThirdParty/tclap"]
 	path = ThirdParty/tclap
 	url = https://github.com/ufz/tclap.git
-[submodule "ThirdParty/autocheck"]
-	path = ThirdParty/autocheck
-	url = https://github.com/ufz/autocheck.git
 [submodule "ThirdParty/metis"]
 	path = ThirdParty/metis
 	url = https://github.com/scibuilder/metis.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a709f2ecba68d2bbd0587c9c3abba59938f3b38e..f08928fa9dcae944a145b8716ed2a3a690f24a93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,7 +223,6 @@ add_subdirectory(ThirdParty)
 include_directories(
     SYSTEM
     ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty
-    ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/autocheck/include
     ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include
     ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include
     ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/exprtk
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 23f0e8f55266f29d961bbcea54714c3bae32888b..8418493cc3edae1048ec9a457792cbe99977b85e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -57,6 +57,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing)
 target_link_libraries(testrunner
     PRIVATE
         ApplicationsFileIO
+        autocheck
         gtest
         MeshGeoToolsLib
         MaterialLib
diff --git a/ThirdParty/autocheck b/ThirdParty/autocheck
deleted file mode 160000
index e388ecbb31c49fc2724c8d0436da313b6edca7fd..0000000000000000000000000000000000000000
--- a/ThirdParty/autocheck
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e388ecbb31c49fc2724c8d0436da313b6edca7fd
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 0adb99f7c6d3ac3f950579e538edb7b860d39f5f..8ca90b6259f04d20324c16889681bf68c35d90cb 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -9,6 +9,16 @@ if(BUILD_TESTING)
             "INSTALL_GTEST OFF"
             "gtest_force_shared_crt ON"
     )
+    CPMAddPackage(
+        NAME autocheck
+        GITHUB_REPOSITORY ufz/autocheck
+        GIT_TAG e388ecbb31c49fc2724c8d0436da313b6edca7fd
+        DOWNLOAD_ONLY YES
+    )
+    if(autocheck_ADDED)
+        add_library(autocheck INTERFACE IMPORTED)
+        target_include_directories(autocheck INTERFACE ${autocheck_SOURCE_DIR}/include)
+    endif()
 endif()
 
 ######################
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 17e1c19d44f5debcc33d7efa22fcbe22fe5e24db..bf11534fb1e445ace6372e7a0dcd16e7f0bb8051 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -9,7 +9,6 @@ if(NOT OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT)
     set(OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT "")
 endif()
 set(REQUIRED_SUBMODULES
-    ThirdParty/autocheck
     ThirdParty/cmake-modules
     ThirdParty/exprtk
     ThirdParty/iphreeqc/src